bisect--helper: `write_terms` shell function in C

diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c
index db9091e249454e2678ce37fb7c5c5b391e330bcc..2bd2d396e335df9fe063af0ffcf69c32a798c9ef 100644 (file)
--- a/builtin/bisect--helper.c
+++ b/builtin/bisect--helper.c
@@ -4,9 +4,11 @@
 #include "bisect.h"
 #include "refs.h"
 
+static GIT_PATH_FUNC(git_path_bisect_terms, "BISECT_TERMS")
+
 static const char * const git_bisect_helper_usage[] = {
        N_("git bisect--helper --next-all [--no-checkout]"),
-       N_("git bisect--helper --check-term-format <term> <orig_term>"),
+       N_("git bisect--helper --write-terms <bad_term> <good_term>"),
        NULL
 };
 
@@ -57,18 +59,38 @@ static int check_term_format(const char *term, const char *orig_term)
        return 0;
 }
 
+static int write_terms(const char *bad, const char *good)
+{
+       FILE *fp = NULL;
+       int res;
+
+       if (!strcmp(bad, good))
+               return error(_("please use two different terms"));
+
+       if (check_term_format(bad, "bad") || check_term_format(good, "good"))
+               return -1;
+
+       fp = fopen(git_path_bisect_terms(), "w");
+       if (!fp)
+               return error_errno(_("could not open the file BISECT_TERMS"));
+
+       res = fprintf(fp, "%s\n%s\n", bad, good);
+       res |= fclose(fp);
+       return (res < 0) ? -1 : 0;
+}
+
 int cmd_bisect__helper(int argc, const char **argv, const char *prefix)
 {
        enum {
                NEXT_ALL = 1,
-               CHECK_TERM_FMT
+               WRITE_TERMS
        } cmdmode = 0;
        int no_checkout = 0;
        struct option options[] = {
                OPT_CMDMODE(0, "next-all", &cmdmode,
                         N_("perform 'git bisect next'"), NEXT_ALL),
-               OPT_CMDMODE(0, "check-term-format", &cmdmode,
-                        N_("check format of the term"), CHECK_TERM_FMT),
+               OPT_CMDMODE(0, "write-terms", &cmdmode,
+                        N_("write the terms to .git/BISECT_TERMS"), WRITE_TERMS),
                OPT_BOOL(0, "no-checkout", &no_checkout,
                         N_("update BISECT_HEAD instead of checking out the current commit")),
                OPT_END()
@@ -83,10 +105,10 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix)
        switch (cmdmode) {
        case NEXT_ALL:
                return bisect_next_all(prefix, no_checkout);
-       case CHECK_TERM_FMT:
+       case WRITE_TERMS:
                if (argc != 2)
-                       return error(_("--check-term-format requires two arguments"));
-               return check_term_format(argv[0], argv[1]);
+                       return error(_("--write-terms requires two arguments"));
+               return write_terms(argv[0], argv[1]);
        default:
                return error("BUG: unknown subcommand '%d'", cmdmode);
        }