Skip to content

Commit

Permalink
t4129: prevent loss of exit code due to the use of pipes
Browse files Browse the repository at this point in the history
Piping the output of git commands like git-ls-files to another
command (grep in this case) hides the exit code returned by
these commands. Prevent this by storing the output of git-ls-files
to a temporary file and then "grep-ping" from that file. Replace
grep with test_grep as the latter is more verbose when it fails.

Signed-off-by: Chandra Pratap <[email protected]>
Signed-off-by: Junio C Hamano <[email protected]>
  • Loading branch information
Chandra Pratap authored and gitster committed Jan 10, 2024
1 parent a54a84b commit 1260914
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions t/t4129-apply-samemode.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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)' '
Expand All @@ -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' '
Expand Down

0 comments on commit 1260914

Please sign in to comment.