Michael Haggerty <mhagger@xxxxxxxxxxxx> writes: > I discovered this problem when an innocent modification to unrelated > code triggered test failures. > > notes-merge.c | 3 ++- > 1 files changed, 2 insertions(+), 1 deletions(-) > > diff --git notes-merge.c notes-merge.c > index e1aaf43..baaf31f 100644 > --- notes-merge.c > +++ notes-merge.c It is Ok to play with -p0 yourself but please don't do that in the public. > @@ -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; > } -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html