Copy resolve_ref() return value for longer use

diff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c
index 7e2f22589dcb14d5ba95ce1331ef816a458533d0..a3ba21520916ce2e244839304def0a748e8a53c7 100644 (file)
--- a/builtin/fmt-merge-msg.c
+++ b/builtin/fmt-merge-msg.c
@@ -268,6 +268,7 @@ static int do_fmt_merge_msg(int merge_title, struct strbuf *in,
                die("No current branch");
        if (!prefixcmp(current_branch, "refs/heads/"))
                current_branch += 11;
+       current_branch = xstrdup(current_branch);
 
        /* get a line */
        while (pos < in->len) {
@@ -283,8 +284,10 @@ static int do_fmt_merge_msg(int merge_title, struct strbuf *in,
                        die ("Error in line %d: %.*s", i, len, p);
        }
 
-       if (!srcs.nr)
+       if (!srcs.nr) {
+               free((char*)current_branch);
                return 0;
+       }
 
        if (merge_title)
                do_fmt_merge_msg_title(out, current_branch);
@@ -306,6 +309,7 @@ static int do_fmt_merge_msg(int merge_title, struct strbuf *in,
                        shortlog(origins.items[i].string, origins.items[i].util,
                                        head, &rev, shortlog_len, out);
        }
+       free((char *)current_branch);
        return 0;
 }