Wrap text
Report abuse
|
|
* expecting success:
{
echo; echo;
echo A; echo B; echo C;
echo;
} >file1 &&
cat file1 >file1.orig &&
{
cat file1 &&
echo Q | tr -d "\\012"
} >file2 &&
cat file2 >file2.orig
git add file1 file2 &&
sed -e "/^B/d" file1 &&
sed -e "/^B/d" file2 &&
cat file1 >file1.mods &&
cat file2 >file2.mods &&
git diff |
sed -e "s/^ \$//" >diff.output
* ok 1: setup
* expecting success:
git apply --numstat diff.output >actual &&
{
echo "0 1 file1" &&
echo "0 1 file2"
} >expect &&
diff -u expect actual
--- expect 2007-03-22 23:19:46.000000000 +0000
+++ actual 2007-03-22 23:19:46.000000000 +0000
@@ -1,2 +1,2 @@
0 1 file1
-0 1 file2
+1 2 file2
* FAIL 2: apply --numstat
git apply --numstat diff.output >actual &&
{
echo "0 1 file1" &&
echo "0 1 file2"
} >expect &&
diff -u expect actual
|