diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-04-16 07:37:33 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-04-16 07:37:33 (GMT) |
| commit | 464509f790f409d95e0820364ef7296d82942d8c (patch) | |
| tree | 5825102bb17963d3890c487d88f6d69703620947 /t/t6030-bisect-porcelain.sh | |
| parent | 2b6f0b0a78a713be51149f27c2c1172fe4afc9cd (diff) | |
| parent | d3e54c88291c2d880ff3a72167c5d3159aed8e97 (diff) | |
| download | git-464509f790f409d95e0820364ef7296d82942d8c.zip git-464509f790f409d95e0820364ef7296d82942d8c.tar.gz git-464509f790f409d95e0820364ef7296d82942d8c.tar.bz2 | |
Merge branch 'maint-1.5.4' into maint
* maint-1.5.4:
git-bisect: make "start", "good" and "skip" succeed or fail atomically
git-am: cope better with an empty Subject: line
Ignore leading empty lines while summarizing merges
bisect: squelch "fatal: ref HEAD not a symref" misleading message
builtin-apply: Show a more descriptive error on failure when opening a patch
Clarify documentation of git-cvsserver, particularly in relation to git-shell
Diffstat (limited to 't/t6030-bisect-porcelain.sh')
| -rwxr-xr-x | t/t6030-bisect-porcelain.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh index 32d6118..5e3e544 100755 --- a/t/t6030-bisect-porcelain.sh +++ b/t/t6030-bisect-porcelain.sh @@ -71,8 +71,12 @@ 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' ' +test_expect_success 'bisect fails if given any junk instead of revs' ' git bisect reset && + test_must_fail git bisect start foo $HASH1 -- && + test_must_fail git bisect start $HASH4 $HASH1 bar -- && + test -z "$(git for-each-ref "refs/bisect/*")" && + test_must_fail ls .git/BISECT_* && git bisect start && test_must_fail git bisect good foo $HASH1 && test_must_fail git bisect good $HASH1 bar && @@ -80,6 +84,7 @@ test_expect_success 'bisect good and bad fails if not given only revs' ' test_must_fail git bisect bad $HASH3 $HASH4 && test_must_fail git bisect skip bar $HASH3 && test_must_fail git bisect skip $HASH1 foo && + test -z "$(git for-each-ref "refs/bisect/*")" && git bisect good $HASH1 && git bisect bad $HASH4 ' |