diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-02-14 14:15:54 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-02-14 14:15:54 -0800 |
| commit | 81b216e4f7a338a9137a6faac8c41ba880b24cff (patch) | |
| tree | 19943ae1e2dc4dc51c6b0b76d567057d59f7d695 | |
| parent | 54941a5316188f803a1adf669f1299e07132e041 (diff) | |
| parent | 5f3bfdc4f3de4800737dd0f5df25c10497894178 (diff) | |
| download | git-81b216e4f7a338a9137a6faac8c41ba880b24cff.tar.xz | |
Merge branch 'ab/t4023-avoid-losing-exit-status-of-diff' into maint-2.39
Test fix.
* ab/t4023-avoid-losing-exit-status-of-diff:
t4023: fix ignored exit codes of git
| -rwxr-xr-x | t/t4023-diff-rename-typechange.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/t/t4023-diff-rename-typechange.sh b/t/t4023-diff-rename-typechange.sh index 7cb9909293..787605ce3f 100755 --- a/t/t4023-diff-rename-typechange.sh +++ b/t/t4023-diff-rename-typechange.sh @@ -52,8 +52,8 @@ test_expect_success setup ' ' test_expect_success 'cross renames to be detected for regular files' ' - - git diff-tree five six -r --name-status -B -M | sort >actual && + git diff-tree five six -r --name-status -B -M >out && + sort out >actual && { echo "R100 foo bar" && echo "R100 bar foo" @@ -63,8 +63,8 @@ test_expect_success 'cross renames to be detected for regular files' ' ' test_expect_success 'cross renames to be detected for typechange' ' - - git diff-tree one two -r --name-status -B -M | sort >actual && + git diff-tree one two -r --name-status -B -M >out && + sort out >actual && { echo "R100 foo bar" && echo "R100 bar foo" @@ -74,8 +74,8 @@ test_expect_success 'cross renames to be detected for typechange' ' ' test_expect_success 'moves and renames' ' - - git diff-tree three four -r --name-status -B -M | sort >actual && + git diff-tree three four -r --name-status -B -M >out && + sort out >actual && { # see -B -M (#6) in t4008 echo "C100 foo bar" && |