mirror of
https://github.com/git/git.git
synced 2025-04-22 19:56:39 +00:00
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
This commit is contained in:
commit
6741edcc50
@ -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"
|
||||
|
Loading…
x
Reference in New Issue
Block a user