From: Junio C Hamano <redacted>
Date: Tue, 18 Aug 2020 00:02:45 +0000 (-0700)
Subject: Merge branch 'al/bisect-first-parent'
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=47f0f94bc796037c43000a9852cdf9209a3c3274;p=git.git

Merge branch 'al/bisect-first-parent'

"git bisect" learns the "--first-parent" option to find the first
breakage along the first-parent chain.

* al/bisect-first-parent:
  bisect: combine args passed to find_bisection()
  bisect: introduce first-parent flag
  cmd_bisect__helper: defer parsing no-checkout flag
  rev-list: allow bisect and first-parent flags
  t6030: modernize "git bisect run" tests
---

47f0f94bc796037c43000a9852cdf9209a3c3274
diff --cc bisect.c
index a088a0f82e,1585fcc6ad..d42a3a3767
--- a/bisect.c
+++ b/bisect.c
@@@ -454,9 -461,10 +461,10 @@@ static GIT_PATH_FUNC(git_path_bisect_ru
  static GIT_PATH_FUNC(git_path_bisect_start, "BISECT_START")
  static GIT_PATH_FUNC(git_path_bisect_log, "BISECT_LOG")
  static GIT_PATH_FUNC(git_path_bisect_terms, "BISECT_TERMS")
+ static GIT_PATH_FUNC(git_path_bisect_first_parent, "BISECT_FIRST_PARENT")
  static GIT_PATH_FUNC(git_path_head_name, "head-name")
  
 -static void read_bisect_paths(struct argv_array *array)
 +static void read_bisect_paths(struct strvec *array)
  {
  	struct strbuf str = STRBUF_INIT;
  	const char *filename = git_path_bisect_names();