diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2011-12-13 14:17:48 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-13 17:26:52 (GMT) |
| commit | 96ec7b1e708863d0cd6b8e72a986d6f0a1bb64db (patch) | |
| tree | 6957ce802074c55c0973c8533dbd399a314ecc55 /builtin/fmt-merge-msg.c | |
| parent | e4776bd936aa162b7f00cb26260dc4a6ca444abb (diff) | |
| download | git-96ec7b1e708863d0cd6b8e72a986d6f0a1bb64db.zip git-96ec7b1e708863d0cd6b8e72a986d6f0a1bb64db.tar.gz git-96ec7b1e708863d0cd6b8e72a986d6f0a1bb64db.tar.bz2 | |
Convert resolve_ref+xstrdup to new resolve_refdup function
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/fmt-merge-msg.c')
| -rw-r--r-- | builtin/fmt-merge-msg.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c index bdfa0ea..c81a7fe 100644 --- a/builtin/fmt-merge-msg.c +++ b/builtin/fmt-merge-msg.c @@ -372,14 +372,15 @@ int fmt_merge_msg(struct strbuf *in, struct strbuf *out, int i = 0, pos = 0; unsigned char head_sha1[20]; const char *current_branch; + void *current_branch_to_free; /* get current branch */ - current_branch = resolve_ref("HEAD", head_sha1, 1, NULL); + current_branch = current_branch_to_free = + resolve_refdup("HEAD", head_sha1, 1, NULL); if (!current_branch) 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) { @@ -421,7 +422,7 @@ int fmt_merge_msg(struct strbuf *in, struct strbuf *out, } strbuf_complete_line(out); - free((char *)current_branch); + free(current_branch_to_free); return 0; } |