Ben Peart 92203e6432 t3507: add a testcase showing failure with sparse checkout ...

Recent changes in merge_content() induced a bug when merging files that are
not present in the local working directory due to sparse-checkout. Add a
test case to demonstrate the bug so that we can ensure the fix resolves
it and to prevent future regressions.

Signed-off-by: Ben Peart <benpeart@microsoft.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

2018-07-27 11:15:18 -07:00

10 KiB

Executable File

Raw Blame History

View Raw