4f4b18497a
Broken &&-chains in the test scripts have been corrected.
* es/test-chain-lint:
t6000-t9999: detect and signal failure within loop
t5000-t5999: detect and signal failure within loop
t4000-t4999: detect and signal failure within loop
t0000-t3999: detect and signal failure within loop
tests: simplify by dropping unnecessary `for` loops
tests: apply modern idiom for exiting loop upon failure
tests: apply modern idiom for signaling test failure
tests: fix broken &&-chains in `{...}` groups
tests: fix broken &&-chains in `$(...)` command substitutions
tests: fix broken &&-chains in compound statements
tests: use test_write_lines() to generate line-oriented output
tests: simplify construction of large blocks of text
t9107: use shell parameter expansion to avoid breaking &&-chain
t6300: make `%(raw:size) --shell` test more robust
t5516: drop unnecessary subshell and command invocation
t4202: clarify intent by creating expected content less cleverly
t1020: avoid aborting entire test script when one test fails
t1010: fix unnoticed failure on Windows
t/lib-pager: use sane_unset() to avoid breaking &&-chain
94 lines
1.8 KiB
Bash
Executable File
94 lines
1.8 KiB
Bash
Executable File
#!/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
|