diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-12-06 20:09:04 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-12-06 20:09:04 +0300 |
| commit | 0cfcb1695f461db0330934f951160c9824d4de8f (patch) | |
| tree | fcf3f5426ba74ac98939229266fee5dfb3dfad35 /builtin/notes.c | |
| parent | 2ace172f95f4afdc565bbcbc2373ebf33b8a9371 (diff) | |
| parent | 89b9e31dd56705af01da2a1a3dc2d466172cb016 (diff) | |
Merge branch 'tz/notes-error-to-stderr' into maint
"git notes" sent its error message to its standard output stream,
which was corrected.
* tz/notes-error-to-stderr:
notes: send "Automatic notes merge failed" messages to stderr
Diffstat (limited to 'builtin/notes.c')
| -rw-r--r-- | builtin/notes.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/builtin/notes.c b/builtin/notes.c index 8e54f2d1464..e435286dd83 100644 --- a/builtin/notes.c +++ b/builtin/notes.c @@ -865,10 +865,10 @@ static int merge(int argc, const char **argv, const char *prefix) if (create_symref("NOTES_MERGE_REF", default_notes_ref(), NULL)) die(_("failed to store link to current notes ref (%s)"), default_notes_ref()); - 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"), - git_path(NOTES_MERGE_WORKTREE)); + fprintf(stderr, _("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"), + git_path(NOTES_MERGE_WORKTREE)); } free_notes(t); |