]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'mr/bisect-in-c-2'
authorJunio C Hamano <gitster@pobox.com>
Sun, 4 Oct 2020 19:49:08 +0000 (12:49 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 4 Oct 2020 19:49:08 +0000 (12:49 -0700)
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

1  2 
builtin/bisect--helper.c
git-bisect.sh

index 2f8ef0ea307d920efda0374e6b4a94c72fa2bd38,64f16d5d92ffb0c1433e92735b3e3b5516f9b124..7512b880f0d67fbe5dba8de93271324b8338d7d9
@@@ -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
  };
  
diff --cc git-bisect.sh
Simple merge