undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'hx/push-atomic-with-cert'

Browse Source 
Hotfix to a recently added test script.

* hx/push-atomic-with-cert:
  t5534: split stdout and stderr redirection
This commit is contained in:
Junio C Hamano 2020-10-08 21:53:25 -07:00
commit f491ce954b
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
t/t5534-push-signed.sh
View File

@ -282,10 +282,9 @@ test_expect_success GPG 'failed atomic push does not execute GPG' '
EOF
test_must_fail env PATH="$TRASH_DIRECTORY:$PATH" git push \
--signed --atomic --porcelain \
dst noop ff noff >out 2>&1 &&
dst noop ff noff >out 2>err &&
test_i18ngrep ! "gpg failed to sign" out &&
sed -n -e "/^To dst/,$ p" out >actual &&
test_i18ngrep ! "gpg failed to sign" err &&
cat >expect <<-EOF &&
To dst
= refs/heads/noop:refs/heads/noop [up to date]
@ -293,7 +292,7 @@ test_expect_success GPG 'failed atomic push does not execute GPG' '
! refs/heads/noff:refs/heads/noff [rejected] (non-fast-forward)
Done
EOF
test_i18ncmp expect actual
test_cmp expect out
'
test_done