]> git.ipfire.org Git - thirdparty/git.git/blobdiff - t/t5400-send-pack.sh
projects / thirdparty / git.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge branch 'dl/checkout-p-merge-base'
[thirdparty/git.git] / t / t5400-send-pack.sh
diff --git a/t/t5400-send-pack.sh b/t/t5400-send-pack.sh
index b84618c925fe014c1cf277da8825ec0a104c18ef..cc86ef213ed0f146986aae3a33f526475d5e9b31 100755 (executable)
--- a/t/t5400-send-pack.sh
+++ b/t/t5400-send-pack.sh
@@ -21,14 +21,15 @@ test_expect_success setup '
        i=0 &&
        while test $i -le $cnt
        do
-           i=$(($i+1)) &&
-           test_tick &&
-           echo "Commit #$i" >mozart/is/pink &&
-           git update-index --add mozart/is/pink &&
-           tree=$(git write-tree) &&
-           commit=$(echo "Commit #$i" | git commit-tree $tree -p $parent) &&
-           git update-ref refs/tags/commit$i $commit &&
-           parent=$commit || return 1
+               i=$(($i+1)) &&
+               test_tick &&
+               echo "Commit #$i" >mozart/is/pink &&
+               git update-index --add mozart/is/pink &&
+               tree=$(git write-tree) &&
+               commit=$(echo "Commit #$i" |
+                        git commit-tree $tree -p $parent) &&
+               git update-ref refs/tags/commit$i $commit &&
+               parent=$commit || return 1
        done &&
        git update-ref HEAD "$commit" &&
        git clone ./. victim &&
@@ -38,14 +39,14 @@ test_expect_success setup '
        i=0 &&
        while test $i -le $cnt
        do
-           i=$(($i+1)) &&
-           test_tick &&
-           echo "Rebase #$i" >mozart/is/pink &&
-           git update-index --add mozart/is/pink &&
-           tree=$(git write-tree) &&
-           commit=$(echo "Rebase #$i" | git commit-tree $tree -p $parent) &&
-           git update-ref refs/tags/rebase$i $commit &&
-           parent=$commit || return 1
+               i=$(($i+1)) &&
+               test_tick &&
+               echo "Rebase #$i" >mozart/is/pink &&
+               git update-index --add mozart/is/pink &&
+               tree=$(git write-tree) &&
+               commit=$(echo "Rebase #$i" | git commit-tree $tree -p $parent) &&
+               git update-ref refs/tags/rebase$i $commit &&
+               parent=$commit || return 1
        done &&
        git update-ref HEAD "$commit" &&
        echo Rebase &&
@@ -57,11 +58,11 @@ test_expect_success 'pack the source repository' '
 '
 
 test_expect_success 'pack the destination repository' '
-    (
-       cd victim &&
-       git repack -a -d &&
-       git prune
-    )
+       (
+               cd victim &&
+               git repack -a -d &&
+               git prune
+       )
 '
 
 test_expect_success 'refuse pushing rewound head without --force' '
@@ -85,10 +86,10 @@ test_expect_success 'push can be used to delete a ref' '
 
 test_expect_success 'refuse deleting push with denyDeletes' '
        (
-           cd victim &&
-           test_might_fail git branch -D extra &&
-           git config receive.denyDeletes true &&
-           git branch extra master
+               cd victim &&
+               test_might_fail git branch -D extra &&
+               git config receive.denyDeletes true &&
+               git branch extra master
        ) &&
        test_must_fail git send-pack ./victim :extra master
 '
@@ -118,9 +119,9 @@ test_expect_success 'override denyDeletes with git -c receive-pack' '
 
 test_expect_success 'denyNonFastforwards trumps --force' '
        (
-           cd victim &&
-           test_might_fail git branch -D extra &&
-           git config receive.denyNonFastforwards true
+               cd victim &&
+               test_might_fail git branch -D extra &&
+               git config receive.denyNonFastforwards true
        ) &&
        victim_orig=$(cd victim && git rev-parse --verify master) &&
        test_must_fail git send-pack --force ./victim master^:master &&
@@ -143,16 +144,16 @@ test_expect_success 'send-pack --all sends all branches' '
 test_expect_success 'push --all excludes remote-tracking hierarchy' '
        mkdir parent &&
        (
-           cd parent &&
-           git init && : >file && git add file && git commit -m add
+               cd parent &&
+               git init && : >file && git add file && git commit -m add
        ) &&
        git clone parent child &&
        (
-           cd child && git push --all
+               cd child && git push --all
        ) &&
        (
-           cd parent &&
-           test -z "$(git for-each-ref refs/remotes/origin)"
+               cd parent &&
+               test -z "$(git for-each-ref refs/remotes/origin)"
        )
 '
 
@@ -160,33 +161,33 @@ test_expect_success 'receive-pack runs auto-gc in remote repo' '
        rm -rf parent child &&
        git init parent &&
        (
-           # Setup a repo with 2 packs
-           cd parent &&
-           echo "Some text" >file.txt &&
-           git add . &&
-           git commit -m "Initial commit" &&
-           git repack -adl &&
-           echo "Some more text" >>file.txt &&
-           git commit -a -m "Second commit" &&
-           git repack
+               # Setup a repo with 2 packs
+               cd parent &&
+               echo "Some text" >file.txt &&
+               git add . &&
+               git commit -m "Initial commit" &&
+               git repack -adl &&
+               echo "Some more text" >>file.txt &&
+               git commit -a -m "Second commit" &&
+               git repack
        ) &&
        cp -R parent child &&
        (
-           # Set the child to auto-pack if more than one pack exists
-           cd child &&
-           git config gc.autopacklimit 1 &&
-           git config gc.autodetach false &&
-           git branch test_auto_gc &&
-           # And create a file that follows the temporary object naming
-           # convention for the auto-gc to remove
-           : >.git/objects/tmp_test_object &&
-           test-tool chmtime =-1209601 .git/objects/tmp_test_object
+               # Set the child to auto-pack if more than one pack exists
+               cd child &&
+               git config gc.autopacklimit 1 &&
+               git config gc.autodetach false &&
+               git branch test_auto_gc &&
+               # And create a file that follows the temporary object naming
+               # convention for the auto-gc to remove
+               : >.git/objects/tmp_test_object &&
+               test-tool chmtime =-1209601 .git/objects/tmp_test_object
        ) &&
        (
-           cd parent &&
-           echo "Even more text" >>file.txt &&
-           git commit -a -m "Third commit" &&
-           git send-pack ../child HEAD:refs/heads/test_auto_gc
+               cd parent &&
+               echo "Even more text" >>file.txt &&
+               git commit -a -m "Third commit" &&
+               git send-pack ../child HEAD:refs/heads/test_auto_gc
        ) &&
        test ! -e child/.git/objects/tmp_test_object
 '
@@ -195,15 +196,15 @@ rewound_push_setup() {
        rm -rf parent child &&
        mkdir parent &&
        (
-           cd parent &&
-           git init &&
-           echo one >file && git add file && git commit -m one &&
-           git config receive.denyCurrentBranch warn &&
-           echo two >file && git commit -a -m two
+               cd parent &&
+               git init &&
+               echo one >file && git add file && git commit -m one &&
+               git config receive.denyCurrentBranch warn &&
+               echo two >file && git commit -a -m two
        ) &&
        git clone parent child &&
        (
-           cd child && git reset --hard HEAD^
+               cd child && git reset --hard HEAD^
        )
 }
 
@@ -211,16 +212,16 @@ test_expect_success 'pushing explicit refspecs respects forcing' '
        rewound_push_setup &&
        parent_orig=$(cd parent && git rev-parse --verify master) &&
        (
-           cd child &&
-           test_must_fail git send-pack ../parent \
-               refs/heads/master:refs/heads/master
+               cd child &&
+               test_must_fail git send-pack ../parent \
+                       refs/heads/master:refs/heads/master
        ) &&
        parent_head=$(cd parent && git rev-parse --verify master) &&
        test "$parent_orig" = "$parent_head" &&
        (
-           cd child &&
-           git send-pack ../parent \
-               +refs/heads/master:refs/heads/master
+               cd child &&
+               git send-pack ../parent \
+                       +refs/heads/master:refs/heads/master
        ) &&
        parent_head=$(cd parent && git rev-parse --verify master) &&
        child_head=$(cd child && git rev-parse --verify master) &&
@@ -231,16 +232,16 @@ test_expect_success 'pushing wildcard refspecs respects forcing' '
        rewound_push_setup &&
        parent_orig=$(cd parent && git rev-parse --verify master) &&
        (
-           cd child &&
-           test_must_fail git send-pack ../parent \
-               "refs/heads/*:refs/heads/*"
+               cd child &&
+               test_must_fail git send-pack ../parent \
+                       "refs/heads/*:refs/heads/*"
        ) &&
        parent_head=$(cd parent && git rev-parse --verify master) &&
        test "$parent_orig" = "$parent_head" &&
        (
-           cd child &&
-           git send-pack ../parent \
-               "+refs/heads/*:refs/heads/*"
+               cd child &&
+               git send-pack ../parent \
+                       "+refs/heads/*:refs/heads/*"
        ) &&
        parent_head=$(cd parent && git rev-parse --verify master) &&
        child_head=$(cd child && git rev-parse --verify master) &&
@@ -250,8 +251,8 @@ test_expect_success 'pushing wildcard refspecs respects forcing' '
 test_expect_success 'deny pushing to delete current branch' '
        rewound_push_setup &&
        (
-           cd child &&
-           test_must_fail git send-pack ../parent :refs/heads/master 2>errs
+               cd child &&
+               test_must_fail git send-pack ../parent :refs/heads/master 2>errs
        )
 '
 
@@ -289,7 +290,7 @@ test_expect_success 'receive-pack de-dupes .have lines' '
        EOF
 
        GIT_TRACE_PACKET=$(pwd)/trace GIT_TEST_PROTOCOL_VERSION=0 \
-           git push \
+       git push \
                --receive-pack="unset GIT_TRACE_PACKET; git-receive-pack" \
                fork HEAD:foo &&
        extract_ref_advertisement <trace >refs &&
Unnamed repository; edit this file 'description' to name the repository.