mirror of
https://github.com/git/git
synced 2024-10-30 03:13:24 +00:00
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
53 lines
1.1 KiB
Bash
Executable file
53 lines
1.1 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='apply with fuzz and offset'
|
|
|
|
|
|
TEST_PASSES_SANITIZE_LEAK=true
|
|
. ./test-lib.sh
|
|
|
|
dotest () {
|
|
name="$1" && shift &&
|
|
test_expect_success "$name" "
|
|
git checkout-index -f -q -u file &&
|
|
git apply $* &&
|
|
test_cmp expect file
|
|
"
|
|
}
|
|
|
|
test_expect_success setup '
|
|
|
|
test_write_lines 1 2 3 4 5 6 7 8 9 10 11 12 >file &&
|
|
git update-index --add file &&
|
|
test_write_lines 1 2 3 4 5 6 7 a b c d e 8 9 10 11 12 >file &&
|
|
cat file >expect &&
|
|
git diff >O0.diff &&
|
|
|
|
sed -e "s/@@ -5,6 +5,11 @@/@@ -2,6 +2,11 @@/" >O1.diff O0.diff &&
|
|
sed -e "s/@@ -5,6 +5,11 @@/@@ -7,6 +7,11 @@/" >O2.diff O0.diff &&
|
|
sed -e "s/@@ -5,6 +5,11 @@/@@ -19,6 +19,11 @@/" >O3.diff O0.diff &&
|
|
|
|
sed -e "s/^ 5/ S/" >F0.diff O0.diff &&
|
|
sed -e "s/^ 5/ S/" >F1.diff O1.diff &&
|
|
sed -e "s/^ 5/ S/" >F2.diff O2.diff &&
|
|
sed -e "s/^ 5/ S/" >F3.diff O3.diff
|
|
|
|
'
|
|
|
|
dotest 'unmodified patch' O0.diff
|
|
|
|
dotest 'minus offset' O1.diff
|
|
|
|
dotest 'plus offset' O2.diff
|
|
|
|
dotest 'big offset' O3.diff
|
|
|
|
dotest 'fuzz with no offset' -C2 F0.diff
|
|
|
|
dotest 'fuzz with minus offset' -C2 F1.diff
|
|
|
|
dotest 'fuzz with plus offset' -C2 F2.diff
|
|
|
|
dotest 'fuzz with big offset' -C2 F3.diff
|
|
|
|
test_done
|