diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-04-26 15:28:37 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-26 15:28:37 -0700 |
| commit | f44014b74de5762627d48128255b94daefdb8dfb (patch) | |
| tree | 49a60b2b43efdf6706a2c746b63c3b9fad1e252d /t | |
| parent | d1ab71804fe2afff4afa664c46a938a72fd237a7 (diff) | |
| parent | f989cac9581ee423457c02f67d6bf31348ae6b56 (diff) | |
| download | git-f44014b74de5762627d48128255b94daefdb8dfb.tar.gz | |
Merge branch 'th/bisect-skipped-log'
* th/bisect-skipped-log:
bisect: Log possibly bad, skipped commits at bisection end
Diffstat (limited to 't')
| -rwxr-xr-x | t/t6030-bisect-porcelain.sh | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh index 4d3074a45c..064f5cefeb 100755 --- a/t/t6030-bisect-porcelain.sh +++ b/t/t6030-bisect-porcelain.sh @@ -759,4 +759,24 @@ test_expect_success 'bisect log: successfull result' ' git bisect reset ' +cat > expected.bisect-skip-log <<EOF +# bad: [32a594a3fdac2d57cf6d02987e30eec68511498c] Add <4: Ciao for now> into <hello>. +# good: [7b7f204a749c3125d5224ed61ea2ae1187ad046f] Add <2: A new day for git> into <hello>. +git bisect start '32a594a3fdac2d57cf6d02987e30eec68511498c' '7b7f204a749c3125d5224ed61ea2ae1187ad046f' +# skip: [3de952f2416b6084f557ec417709eac740c6818c] Add <3: Another new day for git> into <hello>. +git bisect skip 3de952f2416b6084f557ec417709eac740c6818c +# only skipped commits left to test +# possible first bad commit: [32a594a3fdac2d57cf6d02987e30eec68511498c] Add <4: Ciao for now> into <hello>. +# possible first bad commit: [3de952f2416b6084f557ec417709eac740c6818c] Add <3: Another new day for git> into <hello>. +EOF + +test_expect_success 'bisect log: only skip commits left' ' + git bisect reset && + git bisect start $HASH4 $HASH2 && + test_must_fail git bisect skip && + git bisect log >bisect-skip-log.txt && + test_cmp expected.bisect-skip-log bisect-skip-log.txt && + git bisect reset +' + test_done |