summaryrefslogtreecommitdiffstats
path: root/t/t4116-apply-reverse.sh
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-09 13:34:27 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-09 13:34:27 +0000
commit4dbdc42d9e7c3968ff7f690d00680419c9b8cb0f (patch)
tree47c1d492e9c956c1cd2b74dbd3b9d8b0db44dc4e /t/t4116-apply-reverse.sh
parentInitial commit. (diff)
downloadgit-4dbdc42d9e7c3968ff7f690d00680419c9b8cb0f.tar.xz
git-4dbdc42d9e7c3968ff7f690d00680419c9b8cb0f.zip
Adding upstream version 1:2.43.0.upstream/1%2.43.0
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 't/t4116-apply-reverse.sh')
-rwxr-xr-xt/t4116-apply-reverse.sh93
1 files changed, 93 insertions, 0 deletions
diff --git a/t/t4116-apply-reverse.sh b/t/t4116-apply-reverse.sh
new file mode 100755
index 0000000..a9f4ddd
--- /dev/null
+++ b/t/t4116-apply-reverse.sh
@@ -0,0 +1,93 @@
+#!/bin/sh
+#
+# Copyright (c) 2005 Junio C Hamano
+#
+
+test_description='git apply in reverse
+
+'
+
+
+TEST_PASSES_SANITIZE_LEAK=true
+. ./test-lib.sh
+
+test_expect_success setup '
+
+ test_write_lines a b c d e f g h i j k l m n >file1 &&
+ perl -pe "y/ijk/\\000\\001\\002/" <file1 >file2 &&
+
+ git add file1 file2 &&
+ git commit -m initial &&
+ git tag initial &&
+
+ test_write_lines a b c g h i J K L m o n p q >file1 &&
+ perl -pe "y/mon/\\000\\001\\002/" <file1 >file2 &&
+
+ git commit -a -m second &&
+ git tag second &&
+
+ git diff --binary initial second >patch
+
+'
+
+test_expect_success 'apply in forward' '
+
+ T0=$(git rev-parse "second^{tree}") &&
+ git reset --hard initial &&
+ git apply --index --binary patch &&
+ T1=$(git write-tree) &&
+ test "$T0" = "$T1"
+'
+
+test_expect_success 'apply in reverse' '
+
+ git reset --hard second &&
+ git apply --reverse --binary --index patch &&
+ git diff >diff &&
+ test_must_be_empty diff
+
+'
+
+test_expect_success 'setup separate repository lacking postimage' '
+
+ git archive --format=tar --prefix=initial/ initial | $TAR xf - &&
+ (
+ cd initial && git init && git add .
+ ) &&
+
+ git archive --format=tar --prefix=second/ second | $TAR xf - &&
+ (
+ cd second && git init && git add .
+ )
+
+'
+
+test_expect_success 'apply in forward without postimage' '
+
+ T0=$(git rev-parse "second^{tree}") &&
+ (
+ cd initial &&
+ git apply --index --binary ../patch &&
+ T1=$(git write-tree) &&
+ test "$T0" = "$T1"
+ )
+'
+
+test_expect_success 'apply in reverse without postimage' '
+
+ T0=$(git rev-parse "initial^{tree}") &&
+ (
+ cd second &&
+ git apply --index --binary --reverse ../patch &&
+ T1=$(git write-tree) &&
+ test "$T0" = "$T1"
+ )
+'
+
+test_expect_success 'reversing a whitespace introduction' '
+ sed "s/a/a /" < file1 > file1.new &&
+ mv file1.new file1 &&
+ git diff | git apply --reverse --whitespace=error
+'
+
+test_done