diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2017-06-19 18:56:02 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-19 11:09:09 -0700 |
| commit | cdb866b30bd862527de597ae9c7fe7540de55bf2 (patch) | |
| tree | 94363277203d7f4ff06640867e8dfb6785143dd0 /git-rebase.sh | |
| parent | d096d7f1ef81f5c52d0c9d3070ad82b66de9c981 (diff) | |
| download | git-cdb866b30bd862527de597ae9c7fe7540de55bf2.tar.gz git-cdb866b30bd862527de597ae9c7fe7540de55bf2.tar.xz | |
sequencer: print autostash messages to stderr
The rebase messages are printed to stderr traditionally. However due
to a bug introduced in 587947750bd (rebase: implement --[no-]autostash
and rebase.autostash, 2013-05-12) which was faithfully copied when
reimplementing parts of the interactive rebase in the sequencer the
autostash messages are printed to stdout instead.
It is time to fix that: let's print the autostash messages to stderr
instead of stdout.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-rebase.sh')
| -rwxr-xr-x | git-rebase.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-rebase.sh b/git-rebase.sh index 48d7c5ded..3b0448dd3 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -165,14 +165,14 @@ apply_autostash () { stash_sha1=$(cat "$state_dir/autostash") if git stash apply $stash_sha1 2>&1 >/dev/null then - echo "$(gettext 'Applied autostash.')" + echo "$(gettext 'Applied autostash.')" >&2 else git stash store -m "autostash" -q $stash_sha1 || die "$(eval_gettext "Cannot store \$stash_sha1")" gettext 'Applying autostash resulted in conflicts. Your changes are safe in the stash. You can run "git stash pop" or "git stash drop" at any time. -' +' >&2 fi fi } |