diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-02-05 19:40:36 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-02-05 19:40:36 -0800 |
| commit | 5d680a67d7909c89af96eba4a2d77abed606292b (patch) | |
| tree | 8d9c57523870b307d5794df3b5815d848565b5f4 /t | |
| parent | 7aa4e736b295c8784a70645e79dd80a7a80c6147 (diff) | |
| parent | 3d95d92b9a75825b2d9c9bd770d85471b18597f8 (diff) | |
| download | git-5d680a67d7909c89af96eba4a2d77abed606292b.tar.gz | |
Merge branch 'jc/refuse-push-to-current'
* jc/refuse-push-to-current:
receive-pack: explain what to do when push updates the current branch
Diffstat (limited to 't')
| -rwxr-xr-x | t/t5516-fetch-push.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh index 4426df9226..89649e7a9b 100755 --- a/t/t5516-fetch-push.sh +++ b/t/t5516-fetch-push.sh @@ -492,7 +492,7 @@ test_expect_success 'warn on push to HEAD of non-bare repository' ' git checkout master && git config receive.denyCurrentBranch warn) && git push testrepo master 2>stderr && - grep "warning.*this may cause confusion" stderr + grep "warning: updating the current branch" stderr ' test_expect_success 'deny push to HEAD of non-bare repository' ' @@ -510,7 +510,7 @@ test_expect_success 'allow push to HEAD of bare repository (bare)' ' git config receive.denyCurrentBranch true && git config core.bare true) && git push testrepo master 2>stderr && - ! grep "warning.*this may cause confusion" stderr + ! grep "warning: updating the current branch" stderr ' test_expect_success 'allow push to HEAD of non-bare repository (config)' ' @@ -520,7 +520,7 @@ test_expect_success 'allow push to HEAD of non-bare repository (config)' ' git config receive.denyCurrentBranch false ) && git push testrepo master 2>stderr && - ! grep "warning.*this may cause confusion" stderr + ! grep "warning: updating the current branch" stderr ' test_expect_success 'fetch with branches' ' |