mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
Add a test-case for git-apply trying to add an ending line
git-apply adding an ending line doesn't seem to fail if the ending line is already present in the patched file. Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
1bf1a859ae
commit
cc189c2ca2
35
t/t4113-apply-ending.sh
Executable file
35
t/t4113-apply-ending.sh
Executable file
|
@ -0,0 +1,35 @@
|
|||
#!/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 \
|
||||
'git-apply --index test-patch'
|
||||
|
||||
test_done
|
Loading…
Reference in a new issue