diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-04-22 18:11:08 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-22 18:11:08 (GMT) |
| commit | 1fc0bfd65ac50c7c2e2a4ae263cf8ee90c106ce6 (patch) | |
| tree | f0eef7d5d57330fa5a7583a16db0c08654d39fce /t | |
| parent | f4e89b96d8fbc8735bcbb3bad3ad9bf3051b7c83 (diff) | |
| parent | a7f8b8ac945b32d00086c6e3d2fe7b0d00924442 (diff) | |
| download | git-1fc0bfd65ac50c7c2e2a4ae263cf8ee90c106ce6.zip git-1fc0bfd65ac50c7c2e2a4ae263cf8ee90c106ce6.tar.gz git-1fc0bfd65ac50c7c2e2a4ae263cf8ee90c106ce6.tar.bz2 | |
Merge branch 'th/bisect-final-log'
Leave a commit to note what the final outcome was in the bisect log
file.
* th/bisect-final-log:
bisect: Store first bad commit as comment in log file
Diffstat (limited to 't')
| -rwxr-xr-x | t/t6030-bisect-porcelain.sh | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh index 8bf53de..4d3074a 100755 --- a/t/t6030-bisect-porcelain.sh +++ b/t/t6030-bisect-porcelain.sh @@ -741,4 +741,22 @@ test_expect_success 'bisect: demonstrate identification of damage boundary' " git bisect reset " +cat > expected.bisect-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' +# good: [3de952f2416b6084f557ec417709eac740c6818c] Add <3: Another new day for git> into <hello>. +git bisect good 3de952f2416b6084f557ec417709eac740c6818c +# first bad commit: [32a594a3fdac2d57cf6d02987e30eec68511498c] Add <4: Ciao for now> into <hello>. +EOF + +test_expect_success 'bisect log: successfull result' ' + git bisect reset && + git bisect start $HASH4 $HASH2 && + git bisect good && + git bisect log >bisect-log.txt && + test_cmp expected.bisect-log bisect-log.txt && + git bisect reset +' + test_done |