diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-06-30 22:45:21 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-30 22:45:21 +0200 |
| commit | 545222471004cc3fd53c54ff53d40a8bbc3dabe6 (patch) | |
| tree | 69541daf226f975eaf8adeb42482da541b7c33c8 /git-rebase.sh | |
| parent | Twelfth batch for 2.14 (diff) | |
| parent | t3420: fix under GETTEXT_POISON build (diff) | |
| download | git-545222471004cc3fd53c54ff53d40a8bbc3dabe6.tar.xz git-545222471004cc3fd53c54ff53d40a8bbc3dabe6.zip | |
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 '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 db1deed846..2cf73b88e8 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -166,14 +166,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 } |