diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-07 14:47:53 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-07 14:47:53 +0000 |
commit | c8bae7493d2f2910b57f13ded012e86bdcfb0532 (patch) | |
tree | 24e09d9f84dec336720cf393e156089ca2835791 /t/t4116-apply-reverse.sh | |
parent | Initial commit. (diff) | |
download | git-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/t4116-apply-reverse.sh')
-rwxr-xr-x | t/t4116-apply-reverse.sh | 93 |
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 |