diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-01-20 02:04:46 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-01-20 02:04:46 +0300 |
| commit | 1b095626937a858e3a68e9c7d1de11b71117bb42 (patch) | |
| tree | aa16e96ce76d3782589a7404276e2ef3611b12b1 | |
| parent | b5fb62354213384d5f443c2cd835670407a3a2da (diff) | |
| parent | 1260914190ad737029de6f4f61851180a4ccce56 (diff) | |
Merge branch 'cp/t4129-pipefix'
Test update.
* cp/t4129-pipefix:
t4129: prevent loss of exit code due to the use of pipes
| -rwxr-xr-x | t/t4129-apply-samemode.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/t/t4129-apply-samemode.sh b/t/t4129-apply-samemode.sh index e7a7295f1b..2775bfadd8 100755 --- a/t/t4129-apply-samemode.sh +++ b/t/t4129-apply-samemode.sh @@ -41,7 +41,8 @@ test_expect_success FILEMODE 'same mode (index only)' ' chmod +x file && git add file && git apply --cached patch-0.txt && - git ls-files -s file | grep "^100755" + git ls-files -s file >ls-files-output && + test_grep "^100755" ls-files-output ' test_expect_success FILEMODE 'mode update (no index)' ' @@ -60,7 +61,8 @@ test_expect_success FILEMODE 'mode update (with index)' ' test_expect_success FILEMODE 'mode update (index only)' ' git reset --hard && git apply --cached patch-1.txt && - git ls-files -s file | grep "^100755" + git ls-files -s file >ls-files-output && + test_grep "^100755" ls-files-output ' test_expect_success FILEMODE 'empty mode is rejected' ' |