diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-07-10 13:58:59 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-07-10 13:59:00 -0700 |
| commit | 9f6728da31d82e3fd06a00123467aeb64902b4f2 (patch) | |
| tree | 57347e133cc99872fc1e110e8fdfeaebe4408184 /sequencer.c | |
| parent | f904494574035f6ff2725b0e97951c55ccd9dee3 (diff) | |
| parent | adf16c08cb966be9c03e6f5b5b7614f617f81b95 (diff) | |
| download | git-9f6728da31d82e3fd06a00123467aeb64902b4f2.tar.gz | |
Merge branch 'pw/rebase-i-regression-fix-tests' into maint
Fix a recent regression to "git rebase -i" and add tests that would
have caught it and others.
* pw/rebase-i-regression-fix-tests:
t3420: fix under GETTEXT_POISON build
rebase: add more regression tests for console output
rebase: add regression tests for console output
rebase -i: add test for reflog message
sequencer: print autostash messages to stderr
Diffstat (limited to 'sequencer.c')
| -rw-r--r-- | sequencer.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sequencer.c b/sequencer.c index 8c72cf1614..4b24e3bfda 100644 --- a/sequencer.c +++ b/sequencer.c @@ -1921,7 +1921,7 @@ static int apply_autostash(struct replay_opts *opts) argv_array_push(&child.args, "apply"); argv_array_push(&child.args, stash_sha1.buf); if (!run_command(&child)) - printf(_("Applied autostash.\n")); + fprintf(stderr, _("Applied autostash.\n")); else { struct child_process store = CHILD_PROCESS_INIT; @@ -1935,10 +1935,11 @@ static int apply_autostash(struct replay_opts *opts) if (run_command(&store)) ret = error(_("cannot store %s"), stash_sha1.buf); else - printf(_("Applying autostash resulted in conflicts.\n" - "Your changes are safe in the stash.\n" - "You can run \"git stash pop\" or" - " \"git stash drop\" at any time.\n")); + fprintf(stderr, + _("Applying autostash resulted in conflicts.\n" + "Your changes are safe in the stash.\n" + "You can run \"git stash pop\" or" + " \"git stash drop\" at any time.\n")); } strbuf_release(&stash_sha1); |