fmt-merge-msg: add function to append shortlog only

Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin.h b/builtin.h
index 464588b299a473e9e1ee58cbc61e2f981030e37d..322901f339a47486854d90048cbec198db8fce56 100644 (file)
--- a/builtin.h
+++ b/builtin.h
@@ -16,6 +16,7 @@ extern const char *help_unknown_cmd(const char *cmd);
 extern void prune_packed_objects(int);
 extern int fmt_merge_msg(int merge_summary, struct strbuf *in,
        struct strbuf *out);
 extern void prune_packed_objects(int);
 extern int fmt_merge_msg(int merge_summary, struct strbuf *in,
        struct strbuf *out);

+extern int fmt_merge_msg_shortlog(struct strbuf *in, struct strbuf *out);

 extern int commit_tree(const char *msg, unsigned char *tree,
                struct commit_list *parents, unsigned char *ret,
                const char *author);
 extern int commit_tree(const char *msg, unsigned char *tree,
                struct commit_list *parents, unsigned char *ret,
                const char *author);

diff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c
index d0160cb8223051648900ed47fa84d218690ee6a8..48548cf11badaae6b34bfc4140164dde0dc10123 100644 (file)
--- a/builtin/fmt-merge-msg.c
+++ b/builtin/fmt-merge-msg.c
@@ -255,8 +255,8 @@ 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_summary, struct strbuf *in,
-       struct strbuf *out) {
+static int do_fmt_merge_msg(int merge_title, int merge_summary,
+       struct strbuf *in, struct strbuf *out) {

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


@@ -285,7 +285,8 @@ static int do_fmt_merge_msg(int merge_summary, struct strbuf *in,
        if (!srcs.nr)
                return 0;
 
        if (!srcs.nr)
                return 0;
 

-       do_fmt_merge_msg_title(out, current_branch);
+       if (merge_title)
+               do_fmt_merge_msg_title(out, current_branch);

 
        if (merge_summary) {
                struct commit *head;
 
        if (merge_summary) {
                struct commit *head;


@@ -305,7 +306,11 @@ static int do_fmt_merge_msg(int merge_summary, struct strbuf *in,
 }
 
 int fmt_merge_msg(int merge_summary, struct strbuf *in, struct strbuf *out) {
 }
 
 int fmt_merge_msg(int merge_summary, struct strbuf *in, struct strbuf *out) {

-       return do_fmt_merge_msg(merge_summary, in, out);
+       return do_fmt_merge_msg(1, merge_summary, in, out);
+}
+
+int fmt_merge_msg_shortlog(struct strbuf *in, struct strbuf *out) {
+       return do_fmt_merge_msg(0, 1, in, out);

 }
 
 int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix)
 }
 
 int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix)