Merge branch 'rs/opt-help-text'

[git.git] / builtin / fmt-merge-msg.c

diff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c
index d2eed43ab5c165f3b0ed10ba3df4296fc4679dd2..5189b16c9e59c20b449435c413c34da9f7bf9baa 100644 (file)
--- a/builtin/fmt-merge-msg.c
+++ b/builtin/fmt-merge-msg.c
@@ -39,8 +39,8 @@ void init_src_data(struct src_data *data)
        data->generic.strdup_strings = 1;
 }
 
-static struct string_list srcs = { NULL, 0, 0, 1 };
-static struct string_list origins = { NULL, 0, 0, 1 };
+static struct string_list srcs = STRING_LIST_INIT_DUP;
+static struct string_list origins = STRING_LIST_INIT_DUP;
 
 static int handle_line(char *line)
 {
@@ -100,8 +100,8 @@ static int handle_line(char *line)
                origin = line;
                string_list_append(&src_data->tag, origin + 4);
                src_data->head_status |= 2;
-       } else if (!prefixcmp(line, "remote branch ")) {
-               origin = line + 14;
+       } else if (!prefixcmp(line, "remote-tracking branch ")) {
+               origin = line + strlen("remote-tracking branch ");
                string_list_append(&src_data->r_branch, origin);
                src_data->head_status |= 2;
        } else {
@@ -147,7 +147,7 @@ static void shortlog(const char *name, unsigned char *sha1,
        int i, count = 0;
        struct commit *commit;
        struct object *branch;
-       struct string_list subjects = { NULL, 0, 0, 1 };
+       struct string_list subjects = STRING_LIST_INIT_DUP;
        int flags = UNINTERESTING | TREESAME | SEEN | SHOWN | ADDED;
        struct strbuf sb = STRBUF_INIT;
 
@@ -233,7 +233,7 @@ static void do_fmt_merge_msg_title(struct strbuf *out,
                if (src_data->r_branch.nr) {
                        strbuf_addstr(out, subsep);
                        subsep = ", ";
-                       print_joined("remote branch ", "remote branches ",
+                       print_joined("remote-tracking branch ", "remote-tracking branches ",
                                        &src_data->r_branch, out);
                }
                if (src_data->tag.nr) {