index b4de075a3e5df86fe399f9133f7437c4a8d8e26d..91931f0e3fde4874c865aa8dd44615b415d324ee 100755 (executable)
--- a/t/t4117-apply-reject.sh
+++ b/t/t4117-apply-reject.sh
exit 1
fi
- diff -u file1 saved.file1
+ git diff file1 saved.file1
'
test_expect_success 'apply without --reject should fail' '
exit 1
fi
- diff -u file1 saved.file1
+ git diff file1 saved.file1
'
test_expect_success 'apply with --reject should fail but update the file' '
exit 1
fi
- diff -u file1 expected &&
+ git diff file1 expected &&
cat file1.rej &&
echo "file1 still exists?"
exit 1
}
- diff -u file2 expected &&
+ git diff file2 expected &&
cat file2.rej &&
echo "file1 still exists?"
exit 1
}
- diff -u file2 expected &&
+ git diff file2 expected &&
cat file2.rej &&
git apply --verbose patch.1 &&
- diff -u file1 clean
+ git diff file1 clean
'
test_done