diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-12-06 09:09:04 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-12-06 09:09:04 -0800 |
| commit | ce7320901f275caa1086df6fe0bfc74a7ec2fcd5 (patch) | |
| tree | 2861077c0eea689d06a525e967b22bc3952e4cc2 | |
| parent | 0cfcb1695f461db0330934f951160c9824d4de8f (diff) | |
| parent | eadf1c8f454aff0b77202815af7b250320a5f5bf (diff) | |
| download | git-ce7320901f275caa1086df6fe0bfc74a7ec2fcd5.tar.gz | |
Merge branch 'tz/redirect-fix' into maint
A few scripts (both in production and tests) incorrectly redirected
their error output. These have been corrected.
* tz/redirect-fix:
rebase: fix stderr redirect in apply_autostash()
t/lib-gpg: fix gpgconf stderr redirect to /dev/null
| -rwxr-xr-x | git-rebase.sh | 2 | ||||
| -rwxr-xr-x | t/lib-gpg.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/git-rebase.sh b/git-rebase.sh index 6344e8d5e3..aabbf6b69e 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -166,7 +166,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 diff --git a/t/lib-gpg.sh b/t/lib-gpg.sh index 43679a4c64..a5d3b2cbaa 100755 --- a/t/lib-gpg.sh +++ b/t/lib-gpg.sh @@ -31,7 +31,7 @@ then chmod 0700 ./gpghome && GNUPGHOME="$(pwd)/gpghome" && export GNUPGHOME && - (gpgconf --kill gpg-agent 2>&1 >/dev/null || : ) && + (gpgconf --kill gpg-agent >/dev/null 2>&1 || : ) && gpg --homedir "${GNUPGHOME}" 2>/dev/null --import \ "$TEST_DIRECTORY"/lib-gpg/keyring.gpg && gpg --homedir "${GNUPGHOME}" 2>/dev/null --import-ownertrust \ |