kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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
maint
Junio C Hamano 2017-12-06 09:09:04 -08:00
parent 0cfcb1695f eadf1c8f45
commit ce7320901f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-rebase.sh
View File

@ -166,7 +166,7 @@ apply_autostash () {
if test -f "$state_dir/autostash" if test -f "$state_dir/autostash"
then then
stash_sha1=$(cat "$state_dir/autostash") 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 then
echo "$(gettext 'Applied autostash.')" >&2 echo "$(gettext 'Applied autostash.')" >&2
else else

2
t/lib-gpg.sh
View File

@ -31,7 +31,7 @@ then
chmod 0700 ./gpghome && chmod 0700 ./gpghome &&
GNUPGHOME="$(pwd)/gpghome" && GNUPGHOME="$(pwd)/gpghome" &&
export GNUPGHOME && 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 \ gpg --homedir "${GNUPGHOME}" 2>/dev/null --import \
"$TEST_DIRECTORY"/lib-gpg/keyring.gpg && "$TEST_DIRECTORY"/lib-gpg/keyring.gpg &&
gpg --homedir "${GNUPGHOME}" 2>/dev/null --import-ownertrust \ gpg --homedir "${GNUPGHOME}" 2>/dev/null --import-ownertrust \