summaryrefslogtreecommitdiff
path: root/notes-merge.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-10-10 15:56:20 -0700
committerJunio C Hamano <gitster@pobox.com>2011-10-10 15:56:20 -0700
commite579a5d398744e8182decff1329c468d59e6974c (patch)
treef23b42a3337fbbbb2b4e0fb1bb3a25dbf4d4dbaf /notes-merge.c
parentbf604e64fb505738eff2ef7b347635fcd93b776f (diff)
parent852844561e8daaa6689cab48a725f764ad5779cb (diff)
downloadgit-e579a5d398744e8182decff1329c468d59e6974c.tar.gz
Merge branch 'mh/maint-notes-merge-pathbuf-fix'
* mh/maint-notes-merge-pathbuf-fix: notes_merge_commit(): do not pass temporary buffer to other function
Diffstat (limited to 'notes-merge.c')
-rw-r--r--notes-merge.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/notes-merge.c b/notes-merge.c
index 3bbcc9debd..e9e4199311 100644
--- a/notes-merge.c
+++ b/notes-merge.c
@@ -681,7 +681,7 @@ int notes_merge_commit(struct notes_merge_options *o,
* Finally store the new commit object SHA1 into 'result_sha1'.
*/
struct dir_struct dir;
- const char *path = git_path(NOTES_MERGE_WORKTREE "/");
+ char *path = xstrdup(git_path(NOTES_MERGE_WORKTREE "/"));
int path_len = strlen(path), i;
const char *msg = strstr(partial_commit->buffer, "\n\n");
@@ -721,6 +721,7 @@ int notes_merge_commit(struct notes_merge_options *o,
result_sha1);
OUTPUT(o, 4, "Finalized notes merge commit: %s",
sha1_to_hex(result_sha1));
+ free(path);
return 0;
}