summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-05-24 20:19:50 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-05-24 20:23:31 (GMT)
commit65aadb92a1ce9605fa2f412b51de91781a3ef3d6 (patch)
tree7ca4a1797979027fb27a10375d5d9f048d812015 /t
parentcc189c2ca2c725c430f100f61e7c4a6849f93163 (diff)
downloadgit-65aadb92a1ce9605fa2f412b51de91781a3ef3d6.zip
git-65aadb92a1ce9605fa2f412b51de91781a3ef3d6.tar.gz
git-65aadb92a1ce9605fa2f412b51de91781a3ef3d6.tar.bz2
apply: force matching at the beginning.
When there is no leading context, the patch must match at the beginning of preimage; otherwise there is a "patch adds these lines while the other lines were added to the original file" conflict. This is the opposite of match_end fix earlier in this series. Unlike matching at the end case, we can additionally check the preimage line number recorded in the patch, so the change is not symmetrical with the earlier one. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't')
-rwxr-xr-xt/t4113-apply-ending.sh20
1 files changed, 19 insertions, 1 deletions
diff --git a/t/t4113-apply-ending.sh b/t/t4113-apply-ending.sh
index d021ae8..7fd0cf6 100755
--- a/t/t4113-apply-ending.sh
+++ b/t/t4113-apply-ending.sh
@@ -29,7 +29,25 @@ test_expect_success setup \
# test
-test_expect_failure apply \
+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