diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-09-12 20:02:18 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-09-12 20:02:18 +0200 |
| commit | 1b9a1246ef1ea532c7e030e47777035ba0d12a9b (patch) | |
| tree | 2c8e50142f7f759bd31f0f534a0c8034c59bf464 | |
| parent | Merge branch 'jc/how-to-maintain-updates' into maint-2.46 (diff) | |
| parent | tests: drop use of 'tee' that hides exit status (diff) | |
| download | git-1b9a1246ef1ea532c7e030e47777035ba0d12a9b.tar.xz git-1b9a1246ef1ea532c7e030e47777035ba0d12a9b.zip | |
Merge branch 'jc/tests-no-useless-tee' into maint-2.46
Test fixes.
* jc/tests-no-useless-tee:
tests: drop use of 'tee' that hides exit status
| -rwxr-xr-x | t/t1001-read-tree-m-2way.sh | 2 | ||||
| -rwxr-xr-x | t/t5523-push-upstream.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/t/t1001-read-tree-m-2way.sh b/t/t1001-read-tree-m-2way.sh index 88c524f655..48a1550371 100755 --- a/t/t1001-read-tree-m-2way.sh +++ b/t/t1001-read-tree-m-2way.sh @@ -397,7 +397,7 @@ test_expect_success 'a/b vs a, plus c/d case setup.' ' test_expect_success 'a/b vs a, plus c/d case test.' ' read_tree_u_must_succeed -u -m "$treeH" "$treeM" && - git ls-files --stage | tee >treeMcheck.out && + git ls-files --stage >treeMcheck.out && test_cmp treeM.out treeMcheck.out ' diff --git a/t/t5523-push-upstream.sh b/t/t5523-push-upstream.sh index 1f859ade16..4ad36a31e1 100755 --- a/t/t5523-push-upstream.sh +++ b/t/t5523-push-upstream.sh @@ -124,14 +124,14 @@ test_expect_success TTY 'push --no-progress suppresses progress' ' test_expect_success TTY 'quiet push' ' ensure_fresh_upstream && - test_terminal git push --quiet --no-progress upstream main 2>&1 | tee output && + test_terminal git push --quiet --no-progress upstream main >output 2>&1 && test_must_be_empty output ' test_expect_success TTY 'quiet push -u' ' ensure_fresh_upstream && - test_terminal git push --quiet -u --no-progress upstream main 2>&1 | tee output && + test_terminal git push --quiet -u --no-progress upstream main >output 2>&1 && test_must_be_empty output ' |