diff options
author | Todd Zullinger <tmz@pobox.com> | 2017-11-14 11:17:52 -0500 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-11-15 10:23:31 +0900 |
commit | 89b9e31dd56705af01da2a1a3dc2d466172cb016 (patch) | |
tree | 15acb18b4ed356512377ba44cb9939b8553403d4 /builtin/notes.c | |
parent | Git 2.12.5 (diff) | |
download | tgif-89b9e31dd56705af01da2a1a3dc2d466172cb016.tar.xz |
notes: send "Automatic notes merge failed" messages to stderr
All other error messages from notes use stderr. Do the same when
alerting users of an unresolved notes merge.
Fix the output redirection in t3310 and t3320 as well. Previously, the
tests directed output to a file, but stderr was either not captured or
not sent to the file due to the order of the redirection operators.
Signed-off-by: Todd Zullinger <tmz@pobox.com>
Acked-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 5248a9bad8..a261cf24b2 100644 --- a/builtin/notes.c +++ b/builtin/notes.c @@ -862,10 +862,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); |