diff options
Diffstat (limited to 'builtin/notes.c')
| -rw-r--r-- | builtin/notes.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/builtin/notes.c b/builtin/notes.c index b9fec39e57..f6d4696464 100644 --- a/builtin/notes.c +++ b/builtin/notes.c @@ -821,9 +821,10 @@ static int merge(int argc, const char **argv, const char *prefix) 0, &err)) die("%s", err.buf); /* Store ref-to-be-updated into .git/NOTES_MERGE_REF */ - if (create_symref("NOTES_MERGE_REF", default_notes_ref(), NULL)) - die("Failed to store link to current notes ref (%s)", - default_notes_ref()); + if (create_symref("NOTES_MERGE_REF", default_notes_ref(), + NULL, &err)) + die("Failed to store link to current notes ref (%s). " + "%s", default_notes_ref(), err.buf); printf("Automatic notes merge failed. Fix conflicts in %s and " "commit the result with 'git notes merge --commit', or " "abort the merge with 'git notes merge --abort'.\n", |