diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-10-09 06:53:25 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-10-09 06:53:25 +0200 |
| commit | f491ce954b4b317b70705b1670f233f16ea36e12 (patch) | |
| tree | 2c27ef96d13ada2d2d72b5fb2bf430626e8c80b8 /t | |
| parent | Git 2.29-rc0 (diff) | |
| parent | t5534: split stdout and stderr redirection (diff) | |
| download | git-f491ce954b4b317b70705b1670f233f16ea36e12.tar.xz git-f491ce954b4b317b70705b1670f233f16ea36e12.zip | |
Merge branch 'hx/push-atomic-with-cert'
Hotfix to a recently added test script.
* hx/push-atomic-with-cert:
t5534: split stdout and stderr redirection
Diffstat (limited to 't')
| -rwxr-xr-x | t/t5534-push-signed.sh | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/t/t5534-push-signed.sh b/t/t5534-push-signed.sh index 7e928aff66..af0385fb89 100755 --- a/t/t5534-push-signed.sh +++ b/t/t5534-push-signed.sh @@ -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 |