rebase: fix stderr redirect in apply_autostash()
authorTodd Zullinger <tmz@pobox.com>
Mon, 13 Nov 2017 21:20:09 +0000 (16:20 -0500)
committerJunio C Hamano <gitster@pobox.com>
Tue, 14 Nov 2017 02:51:42 +0000 (11:51 +0900)
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>
git-rebase.sh
index 2cf73b88e8e83ca34b9eb319dbc2b0a220139b0f..56013702cdeffb1e476293c4f4ef5011741362cf 100755 (executable)
@@ -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