| commit | 7358a672b2c9df7473961e66e18714963b2bc107 | |
| author | Torstein Hegge <hegge@resisty.net> | |
| Wed, 22 May 2013 22:27:53 +0000 (23 00:27 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 22 May 2013 22:40:43 +0000 (22 15:40 -0700) | ||
| tree | f8bd63c125285826c0356ea3d3b95261522a4ccc | treesnapshot (tar.gz zip) |
| parent | b75cdfaa882a00f2274e74b21c1a9927d184ed29 | commitdiff |
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 <hegge@resisty.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 <hegge@resisty.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| git-bisect.sh | diffblobblamehistory |