author | Junio C Hamano <gitster@pobox.com> | |
Mon, 10 Oct 2011 22:56:20 +0000 (15:56 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Mon, 10 Oct 2011 22:56:20 +0000 (15:56 -0700) |
* mh/maint-notes-merge-pathbuf-fix:
notes_merge_commit(): do not pass temporary buffer to other function
notes_merge_commit(): do not pass temporary buffer to other function
notes-merge.c | patch | blob | history |
diff --git a/notes-merge.c b/notes-merge.c
index 3bbcc9debdc22bd5c7921f30c592c7816504a457..e9e41993117ae03ed7c9d1f28081a42b2eee97ca 100644 (file)
--- a/notes-merge.c
+++ b/notes-merge.c
* 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");
result_sha1);
OUTPUT(o, 4, "Finalized notes merge commit: %s",
sha1_to_hex(result_sha1));
+ free(path);
return 0;
}