summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-08-15 06:24:55 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-08-15 06:24:55 (GMT)
commit6a0ebe8ced66b154a48074d3e3321ff1972ec669 (patch)
treeeada06a5129eb7a3737b85a926eb548432025587
parent78b713a1d0909c8eb8dc0bad5df624c33d065c16 (diff)
downloadgit-6a0ebe8ced66b154a48074d3e3321ff1972ec669.zip
git-6a0ebe8ced66b154a48074d3e3321ff1972ec669.tar.gz
git-6a0ebe8ced66b154a48074d3e3321ff1972ec669.tar.bz2
t4116 apply --reverse test
The binary patch test needs to be made more careful not to have the postimage blob in the repository in which the patch is applied Signed-off-by: Junio C Hamano <junkio@cox.net>
-rwxr-xr-xt/t4116-apply-reverse.sh46
1 files changed, 46 insertions, 0 deletions
diff --git a/t/t4116-apply-reverse.sh b/t/t4116-apply-reverse.sh
new file mode 100755
index 0000000..69aebe6
--- /dev/null
+++ b/t/t4116-apply-reverse.sh
@@ -0,0 +1,46 @@
+#!/bin/sh
+#
+# Copyright (c) 2005 Junio C Hamano
+#
+
+test_description='git-apply in reverse
+
+'
+
+. ./test-lib.sh
+
+test_expect_success setup '
+
+ for i in a b c d e f g h i j k l m n; do echo $i; done >file1 &&
+ tr "[ijk]" '\''[\0\1\2]'\'' <file1 >file2 &&
+
+ git add file1 file2 &&
+ git commit -m initial &&
+ git tag initial &&
+
+ for i in a b c g h i J K L m o n p q; do echo $i; done >file1 &&
+ tr "[mon]" '\''[\0\1\2]'\'' <file1 >file2 &&
+
+ git commit -a -m second &&
+
+ git diff --binary -R initial >patch
+
+'
+
+test_expect_success 'apply in forward' '
+
+ git apply --index --binary patch &&
+ git diff initial >diff &&
+ diff -u /dev/null diff
+
+'
+
+test_expect_success 'apply in reverse' '
+
+ git apply --reverse --binary --index patch &&
+ git diff >diff &&
+ diff -u /dev/null diff
+
+'
+
+test_done