summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCatalin Marinas <catalin.marinas@gmail.com>2006-05-23 21:48:36 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-05-24 07:19:20 (GMT)
commitcc189c2ca2c725c430f100f61e7c4a6849f93163 (patch)
tree9018717599bdbb4b6c552e7df89f42ecb416d519
parent1bf1a859ae980a73552c76fe20a5952a763ec81e (diff)
downloadgit-cc189c2ca2c725c430f100f61e7c4a6849f93163.zip
git-cc189c2ca2c725c430f100f61e7c4a6849f93163.tar.gz
git-cc189c2ca2c725c430f100f61e7c4a6849f93163.tar.bz2
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>
-rwxr-xr-xt/t4113-apply-ending.sh35
1 files changed, 35 insertions, 0 deletions
diff --git a/t/t4113-apply-ending.sh b/t/t4113-apply-ending.sh
new file mode 100755
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