summaryrefslogtreecommitdiff
path: root/builtin/log.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2023-01-23 21:39:52 (GMT)
committerJunio C Hamano <gitster@pobox.com>2023-01-23 21:39:52 (GMT)
commit019a1031eab6042994bdc3636e0d994e1749c408 (patch)
tree4915cbf86c2202e2faecfa427f2144b38ee5dec3 /builtin/log.c
parent6e0f966efe3d5950e5d9bdfe82425cc4c93bcc5c (diff)
parent5b8db44bdd619dc5ec4dcdac5cb3ca194ebdd046 (diff)
downloadgit-019a1031eab6042994bdc3636e0d994e1749c408.zip
git-019a1031eab6042994bdc3636e0d994e1749c408.tar.gz
git-019a1031eab6042994bdc3636e0d994e1749c408.tar.bz2
Merge branch 'jc/format-patch-v-unleak'
Plug a small leak. * jc/format-patch-v-unleak: format-patch: unleak "-v <num>"
Diffstat (limited to 'builtin/log.c')
-rw-r--r--builtin/log.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin/log.c b/builtin/log.c
index 057e299..04412dd 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -1875,6 +1875,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
struct strbuf rdiff1 = STRBUF_INIT;
struct strbuf rdiff2 = STRBUF_INIT;
struct strbuf rdiff_title = STRBUF_INIT;
+ struct strbuf sprefix = STRBUF_INIT;
int creation_factor = -1;
const struct option builtin_format_patch_options[] = {
@@ -2015,12 +2016,10 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
cover_from_description_mode = parse_cover_from_description(cover_from_description_arg);
if (reroll_count) {
- struct strbuf sprefix = STRBUF_INIT;
-
strbuf_addf(&sprefix, "%s v%s",
rev.subject_prefix, reroll_count);
rev.reroll_count = reroll_count;
- rev.subject_prefix = strbuf_detach(&sprefix, NULL);
+ rev.subject_prefix = sprefix.buf;
}
for (i = 0; i < extra_hdr.nr; i++) {
@@ -2384,6 +2383,7 @@ done:
strbuf_release(&rdiff1);
strbuf_release(&rdiff2);
strbuf_release(&rdiff_title);
+ strbuf_release(&sprefix);
free(to_free);
if (rev.ref_message_ids)
string_list_clear(rev.ref_message_ids, 0);