Skip to content

Commit 7358a67

Browse files
heggegitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent b75cdfa commit 7358a67

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

git-bisect.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -320,8 +320,8 @@ bisect_next() {
320320
elif test $res -eq 2
321321
then
322322
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)
325325
do
326326
skipped_commit=$(git show-branch $skipped)
327327
echo "# possible first bad commit: $skipped_commit" >>"$GIT_DIR/BISECT_LOG"

0 commit comments

Comments
 (0)