diff options
| author |  Torstein Hegge <hegge@resisty.net> | 2013-04-13 17:22:57 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-04-15 09:05:42 -0700 |
| commit | a7f8b8ac945b32d00086c6e3d2fe7b0d00924442 (patch) | |
| tree | 7e75ac4689919aedc08f64789b3f2315f8b73cda | |
| parent | Merge branch 'po/help-guides' (diff) | |
| download | tgif-a7f8b8ac945b32d00086c6e3d2fe7b0d00924442.tar.xz | |
bisect: Store first bad commit as comment in log file
When bisect successfully finds a single revision, the first bad commit
should be shown to human readers of 'git bisect log'.
This resolves the apparent disconnect between the bisection result and
the log when a bug reporter says "I know that the first bad commit is
$rev, as you can see from $(git bisect log)".
Signed-off-by: Torstein Hegge <hegge@resisty.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | git-bisect.sh | 8 | ||||
| -rwxr-xr-x | t/t6030-bisect-porcelain.sh | 18 |
2 files changed, 25 insertions, 1 deletions
diff --git a/git-bisect.sh b/git-bisect.sh index 99efbe8845..c58eea7cb6 100755 --- a/git-bisect.sh +++ b/git-bisect.sh @@ -311,7 +311,13 @@ bisect_next() { res=$? # Check if we should exit because bisection is finished - test $res -eq 10 && exit 0 + if test $res -eq 10 + then + bad_rev=$(git show-ref --hash --verify refs/bisect/bad) + bad_commit=$(git show-branch $bad_rev) + echo "# first bad commit: $bad_commit" >>"$GIT_DIR/BISECT_LOG" + exit 0 + fi # Check for an error in the bisection process test $res -ne 0 && exit $res diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh index 8bf53de3ef..4d3074a45c 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 |