diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-07-19 10:39:12 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-19 10:39:12 -0700 |
| commit | 6741edcc501288e0b1bff0773e39c0844d083af8 (patch) | |
| tree | 9d23c7677df929582d6a716f6dd40216ceeaba50 | |
| parent | Merge branch 'rs/tar-tests' into maint (diff) | |
| parent | bisect: Fix log output for multi-parent skip ranges (diff) | |
| download | tgif-6741edcc501288e0b1bff0773e39c0844d083af8.tar.xz | |
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
| -rwxr-xr-x | git-bisect.sh | 4 |
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" |