From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 4 Oct 2020 19:49:08 +0000 (-0700)
Subject: Merge branch 'mr/bisect-in-c-2'
X-Git-Tag: v2.29.0-rc0~26
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f4cc68cbd078d5c0dd707384c802510261c67a28;p=thirdparty%2Fgit.git

Merge branch 'mr/bisect-in-c-2'

Rewrite of the "git bisect" script in C continues.

* mr/bisect-in-c-2:
  bisect--helper: reimplement `bisect_next` and `bisect_auto_next` shell functions in C
  bisect: call 'clear_commit_marks_all()' in 'bisect_next_all()'
  bisect--helper: reimplement `bisect_autostart` shell function in C
  bisect--helper: introduce new `write_in_file()` function
  bisect--helper: use '-res' in 'cmd_bisect__helper' return
  bisect--helper: BUG() in cmd_*() on invalid subcommand
---

f4cc68cbd078d5c0dd707384c802510261c67a28
diff --cc builtin/bisect--helper.c
index 2f8ef0ea30,64f16d5d92..7512b880f0
--- a/builtin/bisect--helper.c
+++ b/builtin/bisect--helper.c
@@@ -27,8 -28,11 +28,11 @@@ static const char * const git_bisect_he
  	N_("git bisect--helper --bisect-check-and-set-terms <command> <good_term> <bad_term>"),
  	N_("git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"),
  	N_("git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --term-new]"),
 -	N_("git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}=<term>]"
 +	N_("git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}=<term>]"
  					    " [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] [<paths>...]"),
+ 	N_("git bisect--helper --bisect-next"),
+ 	N_("git bisect--helper --bisect-auto-next"),
+ 	N_("git bisect--helper --bisect-autostart"),
  	NULL
  };