summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Todd Zullinger <tmz@pobox.com>2017-11-13 16:20:09 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-11-14 11:51:42 +0900
commiteadf1c8f454aff0b77202815af7b250320a5f5bf (patch)
treeb1f2fcc008c8c8eded4216debd2d422163232b6e
parentt/lib-gpg: fix gpgconf stderr redirect to /dev/null (diff)
downloadtgif-eadf1c8f454aff0b77202815af7b250320a5f5bf.tar.xz
rebase: fix stderr redirect in apply_autostash()
The intention is to ignore all output from the 'git stash apply' call. Adjust the order of the redirection to ensure that both stdout and stderr are redirected to /dev/null. Signed-off-by: Todd Zullinger <tmz@pobox.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xgit-rebase.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rebase.sh b/git-rebase.sh
index 2cf73b88e8..56013702cd 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -164,7 +164,7 @@ apply_autostash () {
if test -f "$state_dir/autostash"
then
stash_sha1=$(cat "$state_dir/autostash")
- if git stash apply $stash_sha1 2>&1 >/dev/null
+ if git stash apply $stash_sha1 >/dev/null 2>&1
then
echo "$(gettext 'Applied autostash.')" >&2
else