diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-05-26 19:15:03 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-05-26 19:15:03 -0700 |
| commit | 109440c1bf2a3015cd9253515f07231c4cf9d65a (patch) | |
| tree | 356abfc21c6afc50e660abbea2b8bb373c14d03d /t | |
| parent | Documentation: fix graph in git-rev-parse.txt (diff) | |
| parent | bisect: print an error message when "git rev-list --bisect-vars" fails (diff) | |
| download | tgif-109440c1bf2a3015cd9253515f07231c4cf9d65a.tar.xz | |
Merge branch 'gp/bisect-fix' into maint
* gp/bisect-fix:
bisect: print an error message when "git rev-list --bisect-vars" fails
git-bisect.sh: don't accidentally override existing branch "bisect"
Diffstat (limited to 't')
| -rwxr-xr-x | t/t6030-bisect-porcelain.sh | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh index 5e3e5445c7..933f567983 100755 --- a/t/t6030-bisect-porcelain.sh +++ b/t/t6030-bisect-porcelain.sh @@ -284,6 +284,31 @@ test_expect_success 'bisect starting with a detached HEAD' ' ' +test_expect_success 'bisect refuses to start if branch bisect exists' ' + git bisect reset && + git branch bisect && + test_must_fail git bisect start && + git branch -d bisect && + git checkout -b bisect && + test_must_fail git bisect start && + git checkout master && + git branch -d bisect +' + +test_expect_success 'bisect refuses to start if branch new-bisect exists' ' + git bisect reset && + git branch new-bisect && + test_must_fail git bisect start && + git branch -d new-bisect +' + +test_expect_success 'bisect errors out if bad and good are mistaken' ' + git bisect reset && + test_must_fail git bisect start $HASH2 $HASH4 2> rev_list_error && + grep "mistake good and bad" rev_list_error && + git bisect reset +' + # # test_done |