development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-28 03:59:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'th/bisect-final-log'

Browse source 
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
This commit is contained in:
Junio C Hamano 2013-04-22 11:11:08 -07:00
parent f4e89b96d8 a7f8b8ac94
commit 1fc0bfd65a
2 changed files with 25 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
git-bisect.sh
View file

@ -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

18
t/t6030-bisect-porcelain.sh
View file

@ -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