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.
This commit is contained in:
53
t/t4113-apply-ending.sh
Executable file
53
t/t4113-apply-ending.sh
Executable file
@ -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
|
Reference in New Issue
Block a user