summaryrefslogtreecommitdiffstats
path: root/t/t4104-apply-boundary.sh
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-07 14:47:53 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-07 14:47:53 +0000
commitc8bae7493d2f2910b57f13ded012e86bdcfb0532 (patch)
tree24e09d9f84dec336720cf393e156089ca2835791 /t/t4104-apply-boundary.sh
parentInitial commit. (diff)
downloadgit-c8bae7493d2f2910b57f13ded012e86bdcfb0532.tar.xz
git-c8bae7493d2f2910b57f13ded012e86bdcfb0532.zip
Adding upstream version 1:2.39.2.upstream/1%2.39.2upstream
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 't/t4104-apply-boundary.sh')
-rwxr-xr-xt/t4104-apply-boundary.sh113
1 files changed, 113 insertions, 0 deletions
diff --git a/t/t4104-apply-boundary.sh b/t/t4104-apply-boundary.sh
new file mode 100755
index 0000000..71ef413
--- /dev/null
+++ b/t/t4104-apply-boundary.sh
@@ -0,0 +1,113 @@
+#!/bin/sh
+#
+# Copyright (c) 2005 Junio C Hamano
+#
+
+test_description='git apply boundary tests'
+
+. ./test-lib.sh
+
+L="c d e f g h i j k l m n o p q r s t u v w x"
+
+test_expect_success setup '
+ test_write_lines b $L y >victim &&
+ cat victim >original &&
+ git update-index --add victim &&
+
+ # add to the head
+ test_write_lines a b $L y >victim &&
+ cat victim >add-a-expect &&
+ git diff victim >add-a-patch.with &&
+ git diff --unified=0 >add-a-patch.without &&
+
+ # insert at line two
+ test_write_lines b a $L y >victim &&
+ cat victim >insert-a-expect &&
+ git diff victim >insert-a-patch.with &&
+ git diff --unified=0 >insert-a-patch.without &&
+
+ # modify at the head
+ test_write_lines a $L y >victim &&
+ cat victim >mod-a-expect &&
+ git diff victim >mod-a-patch.with &&
+ git diff --unified=0 >mod-a-patch.without &&
+
+ # remove from the head
+ test_write_lines $L y >victim &&
+ cat victim >del-a-expect &&
+ git diff victim >del-a-patch.with &&
+ git diff --unified=0 >del-a-patch.without &&
+
+ # add to the tail
+ test_write_lines b $L y z >victim &&
+ cat victim >add-z-expect &&
+ git diff victim >add-z-patch.with &&
+ git diff --unified=0 >add-z-patch.without &&
+
+ # modify at the tail
+ test_write_lines b $L z >victim &&
+ cat victim >mod-z-expect &&
+ git diff victim >mod-z-patch.with &&
+ git diff --unified=0 >mod-z-patch.without &&
+
+ # remove from the tail
+ test_write_lines b $L >victim &&
+ cat victim >del-z-expect &&
+ git diff victim >del-z-patch.with &&
+ git diff --unified=0 >del-z-patch.without
+
+ # done
+'
+
+for with in with without
+do
+ case "$with" in
+ with) u= ;;
+ without) u=--unidiff-zero ;;
+ esac
+ for kind in add-a add-z insert-a mod-a mod-z del-a del-z
+ do
+ test_expect_success "apply $kind-patch $with context" '
+ cat original >victim &&
+ git update-index victim &&
+ git apply --index $u "$kind-patch.$with" &&
+ test_cmp "$kind-expect" victim
+ '
+ done
+done
+
+for kind in add-a add-z insert-a mod-a mod-z del-a del-z
+do
+ rm -f $kind-ng.without
+ sed -e "s/^diff --git /diff /" \
+ -e '/^index /d' \
+ <$kind-patch.without >$kind-ng.without
+ test_expect_success "apply non-git $kind-patch without context" '
+ cat original >victim &&
+ git update-index victim &&
+ git apply --unidiff-zero --index "$kind-ng.without" &&
+ test_cmp "$kind-expect" victim
+ '
+done
+
+test_expect_success 'two lines' '
+ >file &&
+ git add file &&
+ echo aaa >file &&
+ git diff >patch &&
+ git add file &&
+ echo bbb >file &&
+ git add file &&
+ test_must_fail git apply --check patch
+'
+
+test_expect_success 'apply patch with 3 context lines matching at end' '
+ test_write_lines a b c d >file &&
+ git add file &&
+ echo e >>file &&
+ git diff >patch &&
+ >file &&
+ test_must_fail git apply patch
+'
+
+test_done