diff options
author | Junio C Hamano <gitster@pobox.com> | 2024-01-22 20:26:18 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2024-01-22 20:26:18 +0300 |
commit | 36b46efbd0ebf212a8f627b59d48a72b43305af1 (patch) | |
tree | efd0e2e1bf78d26d246c11fd120fd4ecefc99f13 | |
parent | 7141d202cbb3eddb9d48e4cb1daf1e153a69c065 (diff) | |
parent | 5ba95e0880a2486509c49b0ee47b58f1d4e95d14 (diff) |
Merge branch 'gt/t0024-style-fixes' into next
Coding style fix.
* gt/t0024-style-fixes:
t0024: style fix
t0024: avoid losing exit status to pipes
-rwxr-xr-x | t/t0024-crlf-archive.sh | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/t/t0024-crlf-archive.sh b/t/t0024-crlf-archive.sh index a34de56420..a7f4de4a43 100755 --- a/t/t0024-crlf-archive.sh +++ b/t/t0024-crlf-archive.sh @@ -9,7 +9,7 @@ test_expect_success setup ' git config core.autocrlf true && - printf "CRLF line ending\r\nAnd another\r\n" > sample && + printf "CRLF line ending\r\nAnd another\r\n" >sample && git add sample && test_tick && @@ -19,8 +19,9 @@ test_expect_success setup ' test_expect_success 'tar archive' ' - git archive --format=tar HEAD | - ( mkdir untarred && cd untarred && "$TAR" -xf - ) && + git archive --format=tar HEAD >test.tar && + mkdir untarred && + "$TAR" xf test.tar -C untarred && test_cmp sample untarred/sample @@ -30,7 +31,11 @@ test_expect_success UNZIP 'zip archive' ' git archive --format=zip HEAD >test.zip && - ( mkdir unzipped && cd unzipped && "$GIT_UNZIP" ../test.zip ) && + mkdir unzipped && + ( + cd unzipped && + "$GIT_UNZIP" ../test.zip + ) && test_cmp sample unzipped/sample |