# Copyright (c) 2005 Junio C Hamano
#
-test_description='git-apply with rejects
+test_description='git apply with rejects
'
exit 1
fi
- diff -u file1 saved.file1
+ test_cmp file1 saved.file1
'
test_expect_success 'apply without --reject should fail' '
exit 1
fi
- diff -u file1 saved.file1
+ test_cmp file1 saved.file1
'
test_expect_success 'apply with --reject should fail but update the file' '
exit 1
fi
- diff -u file1 expected &&
+ test_cmp file1 expected &&
cat file1.rej &&
echo "file1 still exists?"
exit 1
}
- diff -u file2 expected &&
+ test_cmp file2 expected &&
cat file2.rej &&
echo "file1 still exists?"
exit 1
}
- diff -u file2 expected &&
+ test_cmp file2 expected &&
cat file2.rej &&
git apply --verbose patch.1 &&
- diff -u file1 clean
+ test_cmp file1 clean
'
test_done