Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Add a test-case for git-apply trying to add an ending line
author
Catalin Marinas
<catalin.marinas@gmail.com>
Tue, 23 May 2006 21:48:36 +0000
(22:48 +0100)
committer
Junio C Hamano
<junkio@cox.net>
Wed, 24 May 2006 07:19:20 +0000
(
00:19
-0700)
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>
t/t4113-apply-ending.sh
[new file with mode: 0755]
patch
|
blob
raw
|
patch
| inline |
side by side
(parent:
1bf1a85
)
diff --git a/t/t4113-apply-ending.sh
b/t/t4113-apply-ending.sh
new file mode 100755
(executable)
index 0000000..
d021ae8
--- /dev/null
+++ b/
t/t4113-apply-ending.sh
@@ -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