undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'mh/maint-notes-merge-pathbuf-fix' into maint-1.7.6

Browse Source 
* mh/maint-notes-merge-pathbuf-fix:
  notes_merge_commit(): do not pass temporary buffer to other function
This commit is contained in:
Junio C Hamano 2011-10-26 16:12:48 -07:00
commit 8280baf565
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
notes-merge.c
View File

@ -680,7 +680,7 @@ int notes_merge_commit(struct notes_merge_options *o,
* Finally store the new commit object SHA1 into 'result_sha1'. * Finally store the new commit object SHA1 into 'result_sha1'.
*/ */
struct dir_struct dir; 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; int path_len = strlen(path), i;
const char *msg = strstr(partial_commit->buffer, "\n\n"); const char *msg = strstr(partial_commit->buffer, "\n\n");
@ -720,6 +720,7 @@ int notes_merge_commit(struct notes_merge_options *o,
result_sha1); result_sha1);
OUTPUT(o, 4, "Finalized notes merge commit: %s", OUTPUT(o, 4, "Finalized notes merge commit: %s",
sha1_to_hex(result_sha1)); sha1_to_hex(result_sha1));
free(path);
return 0; return 0;
} }