mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
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
This commit is contained in:
commit
ce7320901f
|
@ -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
|
||||
|
|
|
@ -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 \
|
||||
|
|
Loading…
Reference in a new issue