mirror of
https://github.com/git/git.git
synced 2024-11-23 18:05:29 +08: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
99 lines
2.2 KiB
Bash
Executable File
99 lines
2.2 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='apply same filename'
|
|
|
|
|
|
TEST_PASSES_SANITIZE_LEAK=true
|
|
. ./test-lib.sh
|
|
|
|
modify () {
|
|
sed -e "$1" < "$2" > "$2".x &&
|
|
mv "$2".x "$2"
|
|
}
|
|
|
|
test_expect_success setup '
|
|
test_write_lines a b c d e f g h i j k l m >same_fn &&
|
|
cp same_fn other_fn &&
|
|
git add same_fn other_fn &&
|
|
git commit -m initial
|
|
'
|
|
test_expect_success 'apply same filename with independent changes' '
|
|
modify "s/^d/z/" same_fn &&
|
|
git diff > patch0 &&
|
|
git add same_fn &&
|
|
modify "s/^i/y/" same_fn &&
|
|
git diff >> patch0 &&
|
|
cp same_fn same_fn2 &&
|
|
git reset --hard &&
|
|
git apply patch0 &&
|
|
test_cmp same_fn same_fn2
|
|
'
|
|
|
|
test_expect_success 'apply same filename with overlapping changes' '
|
|
git reset --hard &&
|
|
|
|
# Store same_fn so that we can check apply -R in next test
|
|
cp same_fn same_fn1 &&
|
|
|
|
modify "s/^d/z/" same_fn &&
|
|
git diff > patch0 &&
|
|
git add same_fn &&
|
|
modify "s/^e/y/" same_fn &&
|
|
git diff >> patch0 &&
|
|
cp same_fn same_fn2 &&
|
|
git reset --hard &&
|
|
git apply patch0 &&
|
|
test_cmp same_fn same_fn2
|
|
'
|
|
|
|
test_expect_success 'apply same filename with overlapping changes, in reverse' '
|
|
git apply -R patch0 &&
|
|
test_cmp same_fn same_fn1
|
|
'
|
|
|
|
test_expect_success 'apply same new filename after rename' '
|
|
git reset --hard &&
|
|
git mv same_fn new_fn &&
|
|
modify "s/^d/z/" new_fn &&
|
|
git add new_fn &&
|
|
git diff -M --cached > patch1 &&
|
|
modify "s/^e/y/" new_fn &&
|
|
git diff >> patch1 &&
|
|
cp new_fn new_fn2 &&
|
|
git reset --hard &&
|
|
git apply --index patch1 &&
|
|
test_cmp new_fn new_fn2
|
|
'
|
|
|
|
test_expect_success 'apply same old filename after rename -- should fail.' '
|
|
git reset --hard &&
|
|
git mv same_fn new_fn &&
|
|
modify "s/^d/z/" new_fn &&
|
|
git add new_fn &&
|
|
git diff -M --cached > patch1 &&
|
|
git mv new_fn same_fn &&
|
|
modify "s/^e/y/" same_fn &&
|
|
git diff >> patch1 &&
|
|
git reset --hard &&
|
|
test_must_fail git apply patch1
|
|
'
|
|
|
|
test_expect_success 'apply A->B (rename), C->A (rename), A->A -- should pass.' '
|
|
git reset --hard &&
|
|
git mv same_fn new_fn &&
|
|
modify "s/^d/z/" new_fn &&
|
|
git add new_fn &&
|
|
git diff -M --cached > patch1 &&
|
|
git commit -m "a rename" &&
|
|
git mv other_fn same_fn &&
|
|
modify "s/^e/y/" same_fn &&
|
|
git add same_fn &&
|
|
git diff -M --cached >> patch1 &&
|
|
modify "s/^g/x/" same_fn &&
|
|
git diff >> patch1 &&
|
|
git reset --hard HEAD^ &&
|
|
git apply patch1
|
|
'
|
|
|
|
test_done
|