fmt-merge-msg: package options into a structure

This way new features can be added more easily

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin.h b/builtin.h
index 0e9da9083491eb3c18464b730f481cf74ee82430..e94a5dc8a5557e44d35286ee5f70c7929a4d3a51 100644 (file)
--- a/builtin.h
+++ b/builtin.h
@@ -14,8 +14,14 @@ extern const char git_usage_string[];
 extern const char git_more_info_string[];
 
 extern void prune_packed_objects(int);
 extern const char git_more_info_string[];
 
 extern void prune_packed_objects(int);

+
+struct fmt_merge_msg_opts {
+       unsigned add_title:1;
+       int shortlog_len;
+};
+

 extern int fmt_merge_msg(struct strbuf *in, struct strbuf *out,
 extern int fmt_merge_msg(struct strbuf *in, struct strbuf *out,

-                        int merge_title, int shortlog_len);
+                        struct fmt_merge_msg_opts *);

 extern void commit_notes(struct notes_tree *t, const char *msg);
 
 struct notes_rewrite_cfg {
 extern void commit_notes(struct notes_tree *t, const char *msg);
 
 struct notes_rewrite_cfg {

diff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c
index 7b492f91771c62f5dce216a4a015e77eee375d4f..3ff9564e75f69d28c8e44f2934312d302ce6c2bc 100644 (file)
--- a/builtin/fmt-merge-msg.c
+++ b/builtin/fmt-merge-msg.c
@@ -209,7 +209,7 @@ static void shortlog(const char *name, unsigned char *sha1,
        string_list_clear(&subjects, 0);
 }
 
        string_list_clear(&subjects, 0);
 }
 

-static void do_fmt_merge_msg_title(struct strbuf *out,
+static void fmt_merge_msg_title(struct strbuf *out,

        const char *current_branch) {
        int i = 0;
        char *sep = "";
        const char *current_branch) {
        int i = 0;
        char *sep = "";


@@ -262,8 +262,9 @@ static void do_fmt_merge_msg_title(struct strbuf *out,
                strbuf_addf(out, " into %s\n", current_branch);
 }
 
                strbuf_addf(out, " into %s\n", current_branch);
 }
 

-static int do_fmt_merge_msg(int merge_title, struct strbuf *in,
-       struct strbuf *out, int shortlog_len) {
+int fmt_merge_msg(struct strbuf *in, struct strbuf *out,
+                 struct fmt_merge_msg_opts *opts)
+{

        int i = 0, pos = 0;
        unsigned char head_sha1[20];
        const char *current_branch;
        int i = 0, pos = 0;
        unsigned char head_sha1[20];
        const char *current_branch;


@@ -289,10 +290,10 @@ static int do_fmt_merge_msg(int merge_title, struct strbuf *in,
                        die ("Error in line %d: %.*s", i, len, p);
        }
 
                        die ("Error in line %d: %.*s", i, len, p);
        }
 

-       if (merge_title && srcs.nr)
-               do_fmt_merge_msg_title(out, current_branch);
+       if (opts->add_title && srcs.nr)
+               fmt_merge_msg_title(out, current_branch);

 
 

-       if (shortlog_len) {
+       if (opts->shortlog_len) {

                struct commit *head;
                struct rev_info rev;
 
                struct commit *head;
                struct rev_info rev;
 


@@ -307,18 +308,13 @@ static int do_fmt_merge_msg(int merge_title, struct strbuf *in,
 
                for (i = 0; i < origins.nr; i++)
                        shortlog(origins.items[i].string, origins.items[i].util,
 
                for (i = 0; i < origins.nr; i++)
                        shortlog(origins.items[i].string, origins.items[i].util,

-                                       head, &rev, shortlog_len, out);
+                                head, &rev, opts->shortlog_len, out);

        }
        if (out->len && out->buf[out->len-1] != '\n')
                strbuf_addch(out, '\n');
        return 0;
 }
 
        }
        if (out->len && out->buf[out->len-1] != '\n')
                strbuf_addch(out, '\n');
        return 0;
 }
 

-int fmt_merge_msg(struct strbuf *in, struct strbuf *out,
-                 int merge_title, int shortlog_len) {
-       return do_fmt_merge_msg(merge_title, in, out, shortlog_len);
-}
-

 int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix)
 {
        const char *inpath = NULL;
 int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix)
 {
        const char *inpath = NULL;


@@ -340,6 +336,7 @@ int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix)
        FILE *in = stdin;
        struct strbuf input = STRBUF_INIT, output = STRBUF_INIT;
        int ret;
        FILE *in = stdin;
        struct strbuf input = STRBUF_INIT, output = STRBUF_INIT;
        int ret;

+       struct fmt_merge_msg_opts opts;

 
        git_config(fmt_merge_msg_config, NULL);
        argc = parse_options(argc, argv, prefix, options, fmt_merge_msg_usage,
 
        git_config(fmt_merge_msg_config, NULL);
        argc = parse_options(argc, argv, prefix, options, fmt_merge_msg_usage,


@@ -361,10 +358,12 @@ int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix)
 
        if (message)
                strbuf_addstr(&output, message);
 
        if (message)
                strbuf_addstr(&output, message);

-       ret = fmt_merge_msg(&input, &output,
-                           message ? 0 : 1,
-                           shortlog_len);

 
 

+       memset(&opts, 0, sizeof(opts));
+       opts.add_title = !message;
+       opts.shortlog_len = shortlog_len;
+
+       ret = fmt_merge_msg(&input, &output, &opts);

        if (ret)
                return ret;
        write_in_full(STDOUT_FILENO, output.buf, output.len);
        if (ret)
                return ret;
        write_in_full(STDOUT_FILENO, output.buf, output.len);

diff --git a/builtin/merge.c b/builtin/merge.c
index 6a44b6d485fd9fd6621ed07d267a95a951695495..48e7f003d36faafe793bdb8a14863ded603c2e92 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -1229,8 +1229,12 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
                        merge_name(argv[i], &merge_names);
 
                if (!have_message || shortlog_len) {
                        merge_name(argv[i], &merge_names);
 
                if (!have_message || shortlog_len) {

-                       fmt_merge_msg(&merge_names, &merge_msg, !have_message,
-                                     shortlog_len);
+                       struct fmt_merge_msg_opts opts;
+                       memset(&opts, 0, sizeof(opts));
+                       opts.add_title = !have_message;
+                       opts.shortlog_len = shortlog_len;
+
+                       fmt_merge_msg(&merge_names, &merge_msg, &opts);

                        if (merge_msg.len)
                                strbuf_setlen(&merge_msg, merge_msg.len - 1);
                }
                        if (merge_msg.len)
                                strbuf_setlen(&merge_msg, merge_msg.len - 1);
                }