diff options
author | Junio C Hamano <gitster@pobox.com> | 2021-02-17 17:21:42 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-02-17 17:21:42 -0800 |
commit | fdf3a27ca9f44d0c5597b2d1a018b02f09ba8602 (patch) | |
tree | 70dd59574abf2bc0c9f9cd7f0e37cf25f936324b /t/t5411/test-0025-report-unknown-ref--porcelain.sh | |
parent | Merge branch 'js/fsck-name-objects-fix' (diff) | |
parent | t5411: refactor check of refs using test_cmp_refs (diff) | |
download | tgif-fdf3a27ca9f44d0c5597b2d1a018b02f09ba8602.tar.xz |
Merge branch 'jx/t5411-unique-filenames'
Avoid individual tests in t5411 from getting affected by each other
by forcing them to use separate output files during the test.
* jx/t5411-unique-filenames:
t5411: refactor check of refs using test_cmp_refs
t5411: use different out file to prevent overwriting
Diffstat (limited to 't/t5411/test-0025-report-unknown-ref--porcelain.sh')
-rw-r--r-- | t/t5411/test-0025-report-unknown-ref--porcelain.sh | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/t/t5411/test-0025-report-unknown-ref--porcelain.sh b/t/t5411/test-0025-report-unknown-ref--porcelain.sh index 039e8b6163..eeb1ce6b2c 100644 --- a/t/t5411/test-0025-report-unknown-ref--porcelain.sh +++ b/t/t5411/test-0025-report-unknown-ref--porcelain.sh @@ -12,8 +12,8 @@ test_expect_success "setup proc-receive hook (unexpected ref, $PROTOCOL/porcelai test_expect_success "proc-receive: report unknown reference ($PROTOCOL/porcelain)" ' test_must_fail git -C workbench push --porcelain origin \ HEAD:refs/for/a/b/c/my/topic \ - >out 2>&1 && - make_user_friendly_and_stable_output <out >actual && + >out-$test_count 2>&1 && + make_user_friendly_and_stable_output <out-$test_count >actual && cat >expect <<-EOF && remote: # pre-receive hook remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/a/b/c/my/topic @@ -26,10 +26,8 @@ test_expect_success "proc-receive: report unknown reference ($PROTOCOL/porcelain Done EOF test_cmp expect actual && - git -C "$upstream" show-ref >out && - make_user_friendly_and_stable_output <out >actual && - cat >expect <<-EOF && + + test_cmp_refs -C "$upstream" <<-EOF <COMMIT-A> refs/heads/main EOF - test_cmp expect actual ' |