diff options
author | Pranit Bauva <pranit.bauva@gmail.com> | 2017-09-29 06:49:39 +0000 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-10-06 14:12:32 +0900 |
commit | ecb3f3733cbeaf514508f97429863d33a6ac0d57 (patch) | |
tree | 139a1162c59de80ba7188d72f686a1d3779a9963 /builtin/merge-ours.c | |
parent | bisect--helper: rewrite `check_term_format` shell function in C (diff) | |
download | tgif-ecb3f3733cbeaf514508f97429863d33a6ac0d57.tar.xz |
bisect--helper: `write_terms` shell function in C
Reimplement the `write_terms` shell function in C and add a `write-terms`
subcommand to `git bisect--helper` to call it from git-bisect.sh . Also
remove the subcommand `--check-term-format` as it can now be called from
inside the function write_terms() C implementation.
Also `|| exit` is added when calling write-terms subcommand from
git-bisect.sh so as to exit whenever there is an error.
Using `--write-terms` subcommand is a temporary measure to port shell
function to C so as to use the existing test suite. As more functions
are ported, this subcommand will be retired and its implementation will
be called by some other method.
Mentored-by: Lars Schneider <larsxschneider@gmail.com>
Mentored-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Pranit Bauva <pranit.bauva@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions