X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=notes-merge.c;h=baaf31f4aed4e4cfd967c278b7cfd4bee6a0ab30;hb=fb630e048c6efabe4d46b1b125fe7348062d38e6;hp=e1aaf43b438d0cfb6b7b0c723060a662a915bcea;hpb=27c67292019e8d49c5b5e3ce73c59c03c08b2ada;p=git.git

diff --git a/notes-merge.c b/notes-merge.c
index e1aaf43b4..baaf31f4a 100644
--- a/notes-merge.c
+++ b/notes-merge.c
@@ -680,7 +680,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");
 
@@ -720,6 +720,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;
 }