diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-08-12 14:09:53 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-08-12 14:09:53 -0700 |
| commit | 71cc60070f9d41765e58468e467352d2f008abfb (patch) | |
| tree | a68543ff212703cf062e0c5bfd691beca0af5547 /t | |
| parent | efc8a625e9b03e6f8ceed37ccd4b9167a7447e31 (diff) | |
| parent | 4a6ada32cb64b0eba8b6f995e4230f0c722fd580 (diff) | |
| download | git-71cc60070f9d41765e58468e467352d2f008abfb.tar.gz git-71cc60070f9d41765e58468e467352d2f008abfb.tar.xz | |
Merge branch 'ad/bisect-cleanup'
Code and documentation clean-up to "git bisect".
* ad/bisect-cleanup:
bisect: don't mix option parsing and non-trivial code
bisect: simplify the addition of new bisect terms
bisect: replace hardcoded "bad|good" by variables
Documentation/bisect: revise overall content
Documentation/bisect: move getting help section to the end
bisect: correction of typo
Diffstat (limited to 't')
| -rwxr-xr-x | t/t6030-bisect-porcelain.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh index 06b486810..9e2c20374 100755 --- a/t/t6030-bisect-porcelain.sh +++ b/t/t6030-bisect-porcelain.sh @@ -362,7 +362,7 @@ test_expect_success 'bisect starting with a detached HEAD' ' 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 && + grep "mistook good and bad" rev_list_error && git bisect reset ' |