Revision ec82874ad47627a44b6b22a6645551a214293711 authored by Junio C Hamano on 15 December 2010, 19:27:41 UTC, committed by Junio C Hamano on 15 December 2010, 19:27:41 UTC
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2 parent s d8e3ac7 + 88fcc52
Raw File
t4102-apply-rename.sh
#!/bin/sh
#
# Copyright (c) 2005 Junio C Hamano
#

test_description='git apply handling copy/rename patch.

'
. ./test-lib.sh

# setup

cat >test-patch <<\EOF
diff --git a/foo b/bar
similarity index 47%
rename from foo
rename to bar
--- a/foo
+++ b/bar
@@ -1 +1 @@
-This is foo
+This is bar
EOF

echo 'This is foo' >foo
chmod +x foo

test_expect_success setup \
    'git update-index --add foo'

test_expect_success apply \
    'git apply --index --stat --summary --apply test-patch'

if test "$(git config --bool core.filemode)" = false
then
	say 'filemode disabled on the filesystem'
else
	test_set_prereq FILEMODE
fi

test_expect_success FILEMODE validate \
	    'test -f bar && ls -l bar | grep "^-..x......"'

test_expect_success 'apply reverse' \
    'git apply -R --index --stat --summary --apply test-patch &&
     test "$(cat foo)" = "This is foo"'

cat >test-patch <<\EOF
diff --git a/foo b/bar
similarity index 47%
copy from foo
copy to bar
--- a/foo
+++ b/bar
@@ -1 +1 @@
-This is foo
+This is bar
EOF

test_expect_success 'apply copy' \
    'git apply --index --stat --summary --apply test-patch &&
     test "$(cat bar)" = "This is bar" -a "$(cat foo)" = "This is foo"'

test_done
back to top