Merge branch 'th/bisect-skip-report-range-fix'
authorJunio C Hamano <gitster@pobox.com>
Wed, 5 Jun 2013 21:56:38 +0000 (14:56 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 5 Jun 2013 21:56:38 +0000 (14:56 -0700)
Fix for an additional bisect log comments.

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

git-bisect.sh
index d7518e9c3b2cdf16da10b791a0591dc2347fd168..9f064b6f4f0c209a0315538e48049c2d013316df 100755 (executable)
@@ -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"