summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-05-29 06:00:50 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-05-29 06:00:50 (GMT)
commitcd01d9445de1bbca8952c7ee16941f5fa10747f5 (patch)
tree3f2b68cc47981ca22be62a7f077e3727692e3195 /t
parent3f69d405d749742945afd462bff6541604ecd420 (diff)
parent4868f3729acce2aa9512ded7179a895cc50f64c8 (diff)
downloadgit-cd01d9445de1bbca8952c7ee16941f5fa10747f5.zip
git-cd01d9445de1bbca8952c7ee16941f5fa10747f5.tar.gz
git-cd01d9445de1bbca8952c7ee16941f5fa10747f5.tar.bz2
Merge branch 'lt/apply'
* lt/apply: apply: force matching at the beginning. Add a test-case for git-apply trying to add an ending line apply: treat EOF as proper context.
Diffstat (limited to 't')
-rwxr-xr-xt/t4113-apply-ending.sh53
1 files changed, 53 insertions, 0 deletions
diff --git a/t/t4113-apply-ending.sh b/t/t4113-apply-ending.sh
new file mode 100755
index 0000000..7fd0cf6
--- /dev/null
+++ b/t/t4113-apply-ending.sh
@@ -0,0 +1,53 @@
+#!/bin/sh
+#
+# Copyright (c) 2006 Catalin Marinas
+#
+
+test_description='git-apply trying to add an ending line.
+
+'
+. ./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 \
+ 'git-update-index --add file'
+
+# test
+
+test_expect_failure 'apply at the end' \
+ 'git-apply --index test-patch'
+
+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'
+git-update-index file
+
+test_expect_failure 'apply at the beginning' \
+ 'git-apply --index test-patch'
+
+test_done