Make "git-remote prune" delete refs according to fetch specs

diff --git a/t/t5400-send-pack.sh b/t/t5400-send-pack.sh
index 4eaea8f3364343385227b38ac279a603f7ca025b..68c2ae688c2b7ff96ec927622f92fd512e7beefe 100755 (executable)
--- a/t/t5400-send-pack.sh
+++ b/t/t5400-send-pack.sh
@@ -13,9 +13,9 @@ test_expect_success setup '
        test_tick &&
        mkdir mozart mozart/is &&
        echo "Commit #0" >mozart/is/pink &&
-       git-update-index --add mozart/is/pink &&
-       tree=$(git-write-tree) &&
-       commit=$(echo "Commit #0" | git-commit-tree $tree) &&
+       git update-index --add mozart/is/pink &&
+       tree=$(git write-tree) &&
+       commit=$(echo "Commit #0" | git commit-tree $tree) &&
        zero=$commit &&
        parent=$zero &&
        i=0 &&
@@ -24,18 +24,18 @@ test_expect_success setup '
            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 &&
+           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 update-ref HEAD "$commit" &&
        git-clone ./. victim &&
        cd victim &&
-       git-log &&
+       git log &&
        cd .. &&
-       git-update-ref HEAD "$zero" &&
+       git update-ref HEAD "$zero" &&
        parent=$zero &&
        i=0 &&
        while test $i -le $cnt
@@ -43,15 +43,15 @@ test_expect_success setup '
            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 &&
+           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" &&
+       git update-ref HEAD "$commit" &&
        echo Rebase &&
-       git-log'
+       git log'
 
 test_expect_success 'pack the source repository' '
        git repack -a -d &&
@@ -106,11 +106,69 @@ export HOME ;# this way we force the victim/.git/config to be used.
 test_expect_success \
         'pushing with --force should be denied with denyNonFastforwards' '
        cd victim &&
-       git-config receive.denyNonFastforwards true &&
+       git config receive.denyNonFastforwards true &&
        cd .. &&
-       git-update-ref refs/heads/master master^ || return 1
+       git update-ref refs/heads/master master^ || return 1
        git-send-pack --force ./victim/.git/ master && return 1
-       ! git diff .git/refs/heads/master victim/.git/refs/heads/master
+       ! test_cmp .git/refs/heads/master victim/.git/refs/heads/master
+'
+
+test_expect_success \
+       'pushing does not include non-head refs' '
+       mkdir parent && cd parent &&
+       git-init && touch file && git-add file && git-commit -m add &&
+       cd .. &&
+       git-clone parent child && cd child && git-push --all &&
+       cd ../parent &&
+       git-branch -a >branches && ! grep origin/master branches
+'
+
+rewound_push_setup() {
+       rm -rf parent child &&
+       mkdir parent && cd parent &&
+       git-init && echo one >file && git-add file && git-commit -m one &&
+       echo two >file && git-commit -a -m two &&
+       cd .. &&
+       git-clone parent child && cd child && git-reset --hard HEAD^
+}
+
+rewound_push_succeeded() {
+       cmp ../parent/.git/refs/heads/master .git/refs/heads/master
+}
+
+rewound_push_failed() {
+       if rewound_push_succeeded
+       then
+               false
+       else
+               true
+       fi
+}
+
+test_expect_success \
+       'pushing explicit refspecs respects forcing' '
+       rewound_push_setup &&
+       if git-send-pack ../parent/.git refs/heads/master:refs/heads/master
+       then
+               false
+       else
+               true
+       fi && rewound_push_failed &&
+       git-send-pack ../parent/.git +refs/heads/master:refs/heads/master &&
+       rewound_push_succeeded
+'
+
+test_expect_success \
+       'pushing wildcard refspecs respects forcing' '
+       rewound_push_setup &&
+       if git-send-pack ../parent/.git refs/heads/*:refs/heads/*
+       then
+               false
+       else
+               true
+       fi && rewound_push_failed &&
+       git-send-pack ../parent/.git +refs/heads/*:refs/heads/* &&
+       rewound_push_succeeded
 '
 
 test_done