Merge branch 'rf/web'

diff --git a/t/t5400-send-pack.sh b/t/t5400-send-pack.sh
index d831f8dfe3e2ebd5f6753ed82588ab03d3d990bd..28744b35e10602cf5076fbf5c62b3e767a847c0c 100755 (executable)
--- a/t/t5400-send-pack.sh
+++ b/t/t5400-send-pack.sh
@@ -64,6 +64,16 @@ test_expect_success \
        cmp victim/.git/refs/heads/master .git/refs/heads/master
 '
 
+test_expect_success \
+        'push can be used to delete a ref' '
+       cd victim &&
+       git branch extra master &&
+       cd .. &&
+       test -f victim/.git/refs/heads/extra &&
+       git-send-pack ./victim/.git/ :extra master &&
+       ! test -f victim/.git/refs/heads/extra
+'
+
 unset GIT_CONFIG GIT_CONFIG_LOCAL
 HOME=`pwd`/no-such-directory
 export HOME ;# this way we force the victim/.git/config to be used.
@@ -78,13 +88,4 @@ test_expect_success \
        ! diff -u .git/refs/heads/master victim/.git/refs/heads/master
 '
 
-test_expect_success 'push with --keep' '
-       t=`cd victim && git-rev-parse --verify refs/heads/master` &&
-       git-update-ref refs/heads/master $t &&
-       : > foo &&
-       git add foo &&
-       git commit -m "one more" &&
-       git-send-pack --keep ./victim/.git/ master
-'
-
 test_done