From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 19 Jul 2013 17:39:12 +0000 (-0700)
Subject: Merge branch 'th/bisect-skip-report-range-fix' into maint
X-Git-Tag: v1.8.3.4~30
X-Git-Url: https://www.git.lorimer.id.au/gitweb.git/diff_plain/6741edcc501288e0b1bff0773e39c0844d083af8?hp=afebd687f86352b32ee2f386d8059de130137767

Merge branch 'th/bisect-skip-report-range-fix' into maint

The bisect log listed incorrect commits when bisection ends with
only skipped ones.

* th/bisect-skip-report-range-fix:
bisect: Fix log output for multi-parent skip ranges
---

diff --git a/git-bisect.sh b/git-bisect.sh
index d7518e9c3b..9f064b6f4f 100755
--- a/git-bisect.sh
+++ b/git-bisect.sh
@@ -320,8 +320,8 @@ bisect_next() {
 	elif test $res -eq 2
 	then
 		echo "# only skipped commits left to test" >>"$GIT_DIR/BISECT_LOG"
-		good_revs=$(git for-each-ref --format="--not %(objectname)" "refs/bisect/good-*")
-		for skipped in $(git rev-list refs/bisect/bad $good_revs)
+		good_revs=$(git for-each-ref --format="%(objectname)" "refs/bisect/good-*")
+		for skipped in $(git rev-list refs/bisect/bad --not $good_revs)
 		do
 			skipped_commit=$(git show-branch $skipped)
 			echo "# possible first bad commit: $skipped_commit" >>"$GIT_DIR/BISECT_LOG"