b5fcb1c006
The "sparse_checkout_patterns" member was added to the "struct
index_state" in 836e25c51b (sparse-checkout: hold pattern list in
index, 2021-03-30), but wasn't added to discard_index(). Let's do
that.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Taylor Blau <me@ttaylorr.com>
62 lines
1.3 KiB
Bash
Executable File
62 lines
1.3 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='merge with sparse files'
|
|
|
|
TEST_CREATE_REPO_NO_TEMPLATE=1
|
|
TEST_PASSES_SANITIZE_LEAK=true
|
|
. ./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 &&
|
|
mkdir .git/info &&
|
|
echo "/checked-out" >.git/info/sparse-checkout &&
|
|
git reset --hard &&
|
|
test_must_fail 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' '
|
|
test_must_fail 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
|