Skip to content

Commit

Permalink
Merge branch 'cp/t4129-pipefix'
Browse files Browse the repository at this point in the history
Test update.

* cp/t4129-pipefix:
  t4129: prevent loss of exit code due to the use of pipes
  • Loading branch information
gitster committed Jan 19, 2024
2 parents b5fb623 + 1260914 commit 1b09562
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 1b09562

Please sign in to comment.