Browse Source

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>
maint
Catalin Marinas 19 years ago committed by Junio C Hamano
parent
commit
cc189c2ca2
  1. 35
      t/t4113-apply-ending.sh

35
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
Loading…
Cancel
Save