bisect: Fix log output for multi-parent skip ranges
The bisect log output of skipped commits introduced in f989cac "bisect: Log possibly bad, skipped commits at bisection end" should obtain the range of skipped commits from git rev-list bad --not good-1 good-2 not git rev-list bad --not good-1 --not good-2 when the skipped range contains a merge with good points in each parent. Signed-off-by: Torstein Hegge <hegge@resisty.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Torstein Hegge committed
May 23, 2013 at 00:27 UTC
7358a672b2c9df7473961e66e18714963b2bc107
1 file changed
+2
-2
git-bisect.sh
+2
-2
@@ -320,8 +320,8 @@ bisect_next() {
320
elif test $res -eq 2
321
then
322
echo "# only skipped commits left to test" >>"$GIT_DIR/BISECT_LOG"
323
- good_revs=$(git for-each-ref --format="--not %(objectname)" "refs/bisect/good-*")
324
- for skipped in $(git rev-list refs/bisect/bad $good_revs)
323
+ good_revs=$(git for-each-ref --format="%(objectname)" "refs/bisect/good-*")
324
+ for skipped in $(git rev-list refs/bisect/bad --not $good_revs)
325
do
326
skipped_commit=$(git show-branch $skipped)
327
echo "# possible first bad commit: $skipped_commit" >>"$GIT_DIR/BISECT_LOG"