Skip to content

Commit 81b216e

Browse files
committed
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
2 parents 54941a5 + 5f3bfdc commit 81b216e

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

t/t4023-diff-rename-typechange.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ test_expect_success setup '
5252
'
5353

5454
test_expect_success 'cross renames to be detected for regular files' '
55-
56-
git diff-tree five six -r --name-status -B -M | sort >actual &&
55+
git diff-tree five six -r --name-status -B -M >out &&
56+
sort out >actual &&
5757
{
5858
echo "R100 foo bar" &&
5959
echo "R100 bar foo"
@@ -63,8 +63,8 @@ test_expect_success 'cross renames to be detected for regular files' '
6363
'
6464

6565
test_expect_success 'cross renames to be detected for typechange' '
66-
67-
git diff-tree one two -r --name-status -B -M | sort >actual &&
66+
git diff-tree one two -r --name-status -B -M >out &&
67+
sort out >actual &&
6868
{
6969
echo "R100 foo bar" &&
7070
echo "R100 bar foo"
@@ -74,8 +74,8 @@ test_expect_success 'cross renames to be detected for typechange' '
7474
'
7575

7676
test_expect_success 'moves and renames' '
77-
78-
git diff-tree three four -r --name-status -B -M | sort >actual &&
77+
git diff-tree three four -r --name-status -B -M >out &&
78+
sort out >actual &&
7979
{
8080
# see -B -M (#6) in t4008
8181
echo "C100 foo bar" &&

0 commit comments

Comments
 (0)