diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-06-30 20:45:21 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-30 20:45:21 (GMT) |
| commit | 545222471004cc3fd53c54ff53d40a8bbc3dabe6 (patch) | |
| tree | 69541daf226f975eaf8adeb42482da541b7c33c8 /sequencer.c | |
| parent | e0aaa1b6532cfce93d87af9bc813fb2e7a7ce9d7 (diff) | |
| parent | adf16c08cb966be9c03e6f5b5b7614f617f81b95 (diff) | |
| download | git-545222471004cc3fd53c54ff53d40a8bbc3dabe6.zip git-545222471004cc3fd53c54ff53d40a8bbc3dabe6.tar.gz git-545222471004cc3fd53c54ff53d40a8bbc3dabe6.tar.bz2 | |
Merge branch 'pw/rebase-i-regression-fix-tests'
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 98cdfe7..3010faf 100644 --- a/sequencer.c +++ b/sequencer.c @@ -1922,7 +1922,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; @@ -1936,10 +1936,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); |