diff options
| author | Ronnie Sahlberg <sahlberg@google.com> | 2014-11-07 11:42:01 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-11-07 15:46:56 -0800 |
| commit | eeb3f55c165e1a92d8fc85819035247fefe7971a (patch) | |
| tree | 00482fe976a9cbb4c6a5771e89fab04266a41748 /builtin/notes.c | |
| parent | 688b1310ed3277e9578495f816a7caffeb15f0e5 (diff) | |
| download | git-rs/ref-transaction-send-pack.tar.gz | |
refs.c: add an err argument to create_symrefrs/ref-transaction-send-pack
Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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", |