summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-02-09 00:19:46 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-07-29 10:15:42 -0700
commit375881fa6a43e21ab922b20b2061f9868ef18644 (patch)
tree8ca63abdf8437298a4587c5bdd5c2d7a1c3a2cee /t
parentRefuse updating the current branch in a non-bare repository via push (diff)
downloadtgif-375881fa6a43e21ab922b20b2061f9868ef18644.tar.xz
Refuse deleting the current branch via push
This makes git-push refuse deleting the current branch by default. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
-rwxr-xr-xt/t5400-send-pack.sh9
1 files changed, 2 insertions, 7 deletions
diff --git a/t/t5400-send-pack.sh b/t/t5400-send-pack.sh
index 8463332cb8..c718253673 100755
--- a/t/t5400-send-pack.sh
+++ b/t/t5400-send-pack.sh
@@ -191,16 +191,11 @@ test_expect_success 'pushing wildcard refspecs respects forcing' '
test "$parent_head" = "$child_head"
'
-test_expect_success 'warn pushing to delete current branch' '
+test_expect_success 'deny pushing to delete current branch' '
rewound_push_setup &&
(
cd child &&
- git send-pack ../parent :refs/heads/master 2>errs
- ) &&
- grep "warning: to refuse deleting" child/errs &&
- (
- cd parent &&
- test_must_fail git rev-parse --verify master
+ test_must_fail git send-pack ../parent :refs/heads/master 2>errs
)
'