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
This commit is contained in:
commit
81b216e4f7
@ -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" &&
|
||||
|
Loading…
Reference in New Issue
Block a user