diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-04-11 23:55:55 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-04-11 23:55:55 -0700 |
| commit | eed81838f0d0e031702473e1d427d71055134edd (patch) | |
| tree | ba71df8000ce5e640f7258e1bb822461e778da23 /t | |
| parent | a68972c2ad7c3de582abeed03f660e19950ed66f (diff) | |
| parent | e3389075c6160c46cf0e2a443deab1966628ed57 (diff) | |
| download | git-eed81838f0d0e031702473e1d427d71055134edd.tar.gz | |
Merge branch 'maint-1.5.4' into maint
* maint-1.5.4:
bisect: fix bad rev checking in "git bisect good"
revision.c: make --date-order overriddable
Fix section about backdating tags in the git-tag docs
Document option --only of git commit
Documentation/git-request-pull: Fixed a typo ("send" -> "end")
Diffstat (limited to 't')
| -rwxr-xr-x | t/t6030-bisect-porcelain.sh | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh index f471c1526f..32d6118183 100755 --- a/t/t6030-bisect-porcelain.sh +++ b/t/t6030-bisect-porcelain.sh @@ -71,6 +71,19 @@ test_expect_success 'bisect start with one bad and good' ' git bisect next ' +test_expect_success 'bisect good and bad fails if not given only revs' ' + git bisect reset && + git bisect start && + test_must_fail git bisect good foo $HASH1 && + test_must_fail git bisect good $HASH1 bar && + test_must_fail git bisect bad frotz && + test_must_fail git bisect bad $HASH3 $HASH4 && + test_must_fail git bisect skip bar $HASH3 && + test_must_fail git bisect skip $HASH1 foo && + git bisect good $HASH1 && + git bisect bad $HASH4 +' + test_expect_success 'bisect reset: back in the master branch' ' git bisect reset && echo "* master" > branch.expect && |