diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-04-16 07:45:52 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-04-16 07:45:52 (GMT) |
| commit | a17b1d2f0b3128be6f116bf22b58244b310d27b9 (patch) | |
| tree | 6c1fc3fe2a6630902bbd37f45d3e94437a5039b2 /t | |
| parent | 189d6b8bfae62ab0c0bc62877ba97d6d88ae1595 (diff) | |
| parent | 464509f790f409d95e0820364ef7296d82942d8c (diff) | |
| download | git-a17b1d2f0b3128be6f116bf22b58244b310d27b9.zip git-a17b1d2f0b3128be6f116bf22b58244b310d27b9.tar.gz git-a17b1d2f0b3128be6f116bf22b58244b310d27b9.tar.bz2 | |
Merge branch 'maint'
* maint:
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')
| -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 ' |