builtin-commit: fix reflog message generation
Instead of strdup()ing, we can just reuse the buffer in which the commit message is stored, and which is supposed to hold the reflog message anyway. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Schindelin committed
Nov 8, 2007 at 12:15 UTC
741707b1e2261d522a92948ff7d7b897ff00e587
1 file changed
+8
-7
builtin-commit.c
+8
-7
@@ -488,7 +488,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
488
int header_len, parent_count = 0;
489
struct strbuf sb;
490
const char *index_file, *reflog_msg;
491
- char *nl, *header_line;
491
+ char *nl;
492
unsigned char commit_sha1[20];
493
struct ref_lock *ref_lock;
494
@@ -585,12 +585,13 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
585
0);
586
587
nl = strchr(sb.buf + header_len, '\n');
588
- header_line = xstrndup(sb.buf + header_len,
589
- nl - (sb.buf + header_len));
590
- strbuf_release(&sb);
591
- strbuf_addf(&sb, "%s: %s\n", reflog_msg, header_line);
592
- strbuf_addch(&sb, '\0');
593
- free(header_line);
588
+ if (nl)
589
+ strbuf_setlen(&sb, nl + 1 - sb.buf);
590
+ else
591
+ strbuf_addch(&sb, '\n');
592
+ strbuf_remove(&sb, 0, header_len);
593
+ strbuf_insert(&sb, 0, reflog_msg, strlen(reflog_msg));
594
+ strbuf_insert(&sb, strlen(reflog_msg), ": ", 2);
595
596
if (!ref_lock)
597
die("cannot lock HEAD ref");