The option will follow only the first parent commit upon seeing a merge commit, but we need bisect the commits in the merge, so, delete the option.
Signed-off-by: Cao Xueliang caoxl78320@163.com --- lib/git_bisect.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/git_bisect.rb b/lib/git_bisect.rb index 40f6b49..dd0b782 100644 --- a/lib/git_bisect.rb +++ b/lib/git_bisect.rb @@ -89,7 +89,7 @@ class GitBisect puts "bad_commit: #{@bad_commit}" puts "good_commit: #{@good_commit}"
- result = `git -C #{@work_dir} bisect start --first-parent #{@bad_commit} #{@good_commit}` + result = `git -C #{@work_dir} bisect start #{@bad_commit} #{@good_commit}` temp = result.split(/\n/) if temp[0].include? 'Bisecting' result = `git -C #{@work_dir} bisect run #{BISECT_RUN_SCRIPT} #{@bad_job_id} #{@error_id.inspect} #{@work_dir}`
-
Cao Xueliang