summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-10-26 23:12:48 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-10-26 23:12:48 (GMT)
commit8280baf565e1c72adaa6d2dfef70d18837126898 (patch)
tree150aed0a0d12803bc306c5d77d59ae135faa14b5
parent58f75bcf323e86067147ac66bbb493e6a8c2631f (diff)
parent852844561e8daaa6689cab48a725f764ad5779cb (diff)
downloadgit-8280baf565e1c72adaa6d2dfef70d18837126898.zip
git-8280baf565e1c72adaa6d2dfef70d18837126898.tar.gz
git-8280baf565e1c72adaa6d2dfef70d18837126898.tar.bz2
Merge branch 'mh/maint-notes-merge-pathbuf-fix' into maint-1.7.6
* mh/maint-notes-merge-pathbuf-fix: notes_merge_commit(): do not pass temporary buffer to other function
-rw-r--r--notes-merge.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/notes-merge.c b/notes-merge.c
index e1aaf43..baaf31f 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;
}