From: Catalin Marinas <catalin.marinas@gmail.com>
Date: Tue, 23 May 2006 21:48:36 +0000 (+0100)
Subject: Add a test-case for git-apply trying to add an ending line
X-Git-Tag: v1.4.0-rc1~44^2~2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=cc189c2ca2c725c430f100f61e7c4a6849f93163;p=git.git

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>
---

diff --git a/t/t4113-apply-ending.sh b/t/t4113-apply-ending.sh
new file mode 100755
index 000000000..d021ae84c
--- /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