2006-05-23 21:48:36 +00:00
|
|
|
#!/bin/sh
|
|
|
|
#
|
|
|
|
# Copyright (c) 2006 Catalin Marinas
|
|
|
|
#
|
|
|
|
|
2007-07-03 05:52:14 +00:00
|
|
|
test_description='git apply trying to add an ending line.
|
2006-05-23 21:48:36 +00:00
|
|
|
|
|
|
|
'
|
2024-04-22 22:54:05 +00:00
|
|
|
TEST_PASSES_SANITIZE_LEAK=true
|
2006-05-23 21:48:36 +00:00
|
|
|
. ./test-lib.sh
|
|
|
|
|
|
|
|
# setup
|
|
|
|
|
|
|
|
cat >test-patch <<\EOF
|
|
|
|
diff --git a/file b/file
|
|
|
|
--- a/file
|
|
|
|
+++ b/file
|
|
|
|
@@ -1,2 +1,3 @@
|
|
|
|
a
|
|
|
|
b
|
|
|
|
+c
|
|
|
|
EOF
|
|
|
|
|
|
|
|
echo 'a' >file
|
|
|
|
echo 'b' >>file
|
|
|
|
echo 'c' >>file
|
|
|
|
|
|
|
|
test_expect_success setup \
|
2007-07-03 05:52:14 +00:00
|
|
|
'git update-index --add file'
|
2006-05-23 21:48:36 +00:00
|
|
|
|
|
|
|
# test
|
|
|
|
|
2008-02-01 09:50:53 +00:00
|
|
|
test_expect_success 'apply at the end' \
|
2008-07-12 15:47:52 +00:00
|
|
|
'test_must_fail git apply --index test-patch'
|
2006-05-23 21:48:36 +00:00
|
|
|
|
2006-05-24 20:19:50 +00:00
|
|
|
cat >test-patch <<\EOF
|
|
|
|
diff a/file b/file
|
|
|
|
--- a/file
|
|
|
|
+++ b/file
|
|
|
|
@@ -1,2 +1,3 @@
|
|
|
|
+a
|
|
|
|
b
|
|
|
|
c
|
|
|
|
EOF
|
|
|
|
|
|
|
|
echo >file 'a
|
|
|
|
b
|
|
|
|
c'
|
2007-07-03 05:52:14 +00:00
|
|
|
git update-index file
|
2006-05-24 20:19:50 +00:00
|
|
|
|
2008-02-01 09:50:53 +00:00
|
|
|
test_expect_success 'apply at the beginning' \
|
2008-07-12 15:47:52 +00:00
|
|
|
'test_must_fail git apply --index test-patch'
|
2006-05-24 20:19:50 +00:00
|
|
|
|
2006-05-23 21:48:36 +00:00
|
|
|
test_done
|