summaryrefslogtreecommitdiff
path: root/builtin/merge-ours.c
diff options
context:
space:
mode:
authorLibravatar Victoria Dye <vdye@github.com>2022-01-11 18:05:01 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2022-01-13 13:49:45 -0800
commitb553ef674965f41bfff4e0a2c330f9087b3cd6b7 (patch)
treef4f6c2bcc726285d4466c21ff713cf6ee5190d86 /builtin/merge-ours.c
parentclean: integrate with sparse index (diff)
downloadtgif-b553ef674965f41bfff4e0a2c330f9087b3cd6b7.tar.xz
checkout-index: expand sparse checkout compatibility tests
Add tests to cover `checkout-index`, with a focus on cases interesting in a sparse checkout (e.g., files specified outside sparse checkout definition). New tests are intended to serve as a baseline for existing and/or expected behavior and performance when integrating `checkout-index` with the sparse index. Note that the test 'checkout-index --all' is marked as 'test_expect_failure', indicating that `update-index --all` will be modified in a subsequent patch to behave as the test expects. Signed-off-by: Victoria Dye <vdye@github.com> Reviewed-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions