Staging
v0.8.1
https://github.com/git/git
Raw File
Tip revision: aadb70a5594222cac215f9590017f05d5d0f31b2 authored by Junio C Hamano on 07 March 2013, 21:14:39 UTC
Git 1.8.2-rc3
Tip revision: aadb70a
t4113-apply-ending.sh
#!/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_success 'apply at the end' \
    'test_must_fail git apply --index test-patch'

cat >test-patch <<\EOF
diff a/file b/file
--- a/file
+++ b/file
@@ -1,2 +1,3 @@
+a
 b
 c
EOF

echo >file 'a
b
c'
git update-index file

test_expect_success 'apply at the beginning' \
	'test_must_fail git apply --index test-patch'

test_done
back to top