projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 53f9a3e) | patch
t3507: add a testcase showing failure with sparse checkout
authorBen Peart <peartben@gmail.com>
Fri, 27 Jul 2018 12:59:42 +0000 (12:59 +0000)
committerJunio C Hamano <gitster@pobox.com>
Fri, 27 Jul 2018 18:15:18 +0000 (11:15 -0700)
commit92203e6432cd77c3dfc82bd475a4c802085cffcb
tree4a4b053f101de654bdbb2f3a4805dee1fb96dc50tree | snapshot
parent53f9a3e157dbbc901a02ac2c73346d375e24978ccommit | diff
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>
t/t3507-cherry-pick-conflict.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.