mirror of
https://github.com/git/git.git
synced 2024-12-01 05:54:16 +08:00
1c5e94f459
Using 'test_must_be_empty' is shorter and more idiomatic than
>empty &&
test_cmp empty out
as it saves the creation of an empty file. Furthermore, sometimes the
expected empty file doesn't have such a descriptive name like 'empty',
and its creation is far away from the place where it's finally used
for comparison (e.g. in 't7600-merge.sh', where two expected empty
files are created in the 'setup' test, but are used only about 500
lines later).
These cases were found by instrumenting 'test_cmp' to error out the
test script when it's used to compare empty files, and then converted
manually.
Note that even after this patch there still remain a lot of cases
where we use 'test_cmp' to check empty files:
- Sometimes the expected output is not hard-coded in the test, but
'test_cmp' is used to ensure that two similar git commands produce
the same output, and that output happens to be empty, e.g. the
test 'submodule update --merge - ignores --merge for new
submodules' in 't7406-submodule-update.sh'.
- Repetitive common tasks, including preparing the expected results
and running 'test_cmp', are often extracted into a helper
function, and some of this helper's callsites expect no output.
- For the same reason as above, the whole 'test_expect_success'
block is within a helper function, e.g. in 't3070-wildmatch.sh'.
- Or 'test_cmp' is invoked in a loop, e.g. the test 'cvs update
(-p)' in 't9400-git-cvsserver-server.sh'.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
59 lines
1.2 KiB
Bash
Executable File
59 lines
1.2 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='merge with sparse files'
|
|
|
|
. ./test-lib.sh
|
|
|
|
# test_file $filename $content
|
|
test_file () {
|
|
echo "$2" > "$1" &&
|
|
git add "$1"
|
|
}
|
|
|
|
# test_commit_this $message_and_tag
|
|
test_commit_this () {
|
|
git commit -m "$1" &&
|
|
git tag "$1"
|
|
}
|
|
|
|
test_expect_success 'setup' '
|
|
test_file checked-out init &&
|
|
test_file modify_delete modify_delete_init &&
|
|
test_commit_this init &&
|
|
test_file modify_delete modify_delete_theirs &&
|
|
test_commit_this theirs &&
|
|
git reset --hard init &&
|
|
git rm modify_delete &&
|
|
test_commit_this ours &&
|
|
git config core.sparseCheckout true &&
|
|
echo "/checked-out" >.git/info/sparse-checkout &&
|
|
git reset --hard &&
|
|
! git merge theirs
|
|
'
|
|
|
|
test_expect_success 'reset --hard works after the conflict' '
|
|
git reset --hard
|
|
'
|
|
|
|
test_expect_success 'is reset properly' '
|
|
git status --porcelain -- modify_delete >out &&
|
|
test_must_be_empty out &&
|
|
test_path_is_missing modify_delete
|
|
'
|
|
|
|
test_expect_success 'setup: conflict back' '
|
|
! git merge theirs
|
|
'
|
|
|
|
test_expect_success 'Merge abort works after the conflict' '
|
|
git merge --abort
|
|
'
|
|
|
|
test_expect_success 'is aborted properly' '
|
|
git status --porcelain -- modify_delete >out &&
|
|
test_must_be_empty out &&
|
|
test_path_is_missing modify_delete
|
|
'
|
|
|
|
test_done
|