diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-04-11 04:09:56 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-04-11 04:09:56 (GMT) |
commit | c40c1a0df23203f9e05e7c5c01a157d414b37720 (patch) | |
tree | 4248695839dd42f3a6107fb0f019bea641018c54 /t/t5510-fetch.sh | |
parent | 103251a318ed960c9574e68ad21d013fca78560b (diff) | |
parent | a4d4e32a700df92ca576ce89110c075b8ce6da75 (diff) | |
download | git-c40c1a0df23203f9e05e7c5c01a157d414b37720.zip git-c40c1a0df23203f9e05e7c5c01a157d414b37720.tar.gz git-c40c1a0df23203f9e05e7c5c01a157d414b37720.tar.bz2 |
Merge branch 'pk/test-avoid-pipe-hiding-exit-status'
Test cleanup.
* pk/test-avoid-pipe-hiding-exit-status:
test: avoid pipes in git related commands for test
Diffstat (limited to 't/t5510-fetch.sh')
-rwxr-xr-x | t/t5510-fetch.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh index da9ac00..ae5a530 100755 --- a/t/t5510-fetch.sh +++ b/t/t5510-fetch.sh @@ -840,8 +840,8 @@ test_expect_success C_LOCALE_OUTPUT 'fetch aligned output' ' test_commit looooooooooooong-tag && ( cd full-output && - git -c fetch.output=full fetch origin 2>&1 | \ - grep -e "->" | cut -c 22- >../actual + git -c fetch.output=full fetch origin >actual 2>&1 && + grep -e "->" actual | cut -c 22- >../actual ) && cat >expect <<-\EOF && master -> origin/master @@ -855,8 +855,8 @@ test_expect_success C_LOCALE_OUTPUT 'fetch compact output' ' test_commit extraaa && ( cd compact && - git -c fetch.output=compact fetch origin 2>&1 | \ - grep -e "->" | cut -c 22- >../actual + git -c fetch.output=compact fetch origin >actual 2>&1 && + grep -e "->" actual | cut -c 22- >../actual ) && cat >expect <<-\EOF && master -> origin/* |