summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-06-05 14:56:38 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-06-05 14:56:38 -0700
commit058a92ad64cfe55190777b7f4ad5f5772f156286 (patch)
treedb446233ce49b01cb2c0b0ee86963eddd2a0952d
parentMerge branch 'dm/unbash-subtree' (diff)
parentbisect: Fix log output for multi-parent skip ranges (diff)
downloadtgif-058a92ad64cfe55190777b7f4ad5f5772f156286.tar.xz
Merge branch 'th/bisect-skip-report-range-fix'
Fix for an additional bisect log comments. * th/bisect-skip-report-range-fix: bisect: Fix log output for multi-parent skip ranges
-rwxr-xr-xgit-bisect.sh4
1 files changed, 2 insertions, 2 deletions
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"