diff options
author | Derrick Stolee <dstolee@microsoft.com> | 2020-01-31 20:16:15 +0000 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-01-31 13:05:29 -0800 |
commit | f998a3f1e588d73ed7285cb14ac4839f63f6dc82 (patch) | |
tree | 264439faaceedd68588b444cd191b450fbd1e700 /Documentation/technical/trivial-merge.txt | |
parent | sparse-checkout: improve docs around 'set' in cone mode (diff) | |
download | tgif-f998a3f1e588d73ed7285cb14ac4839f63f6dc82.tar.xz |
sparse-checkout: fix cone mode behavior mismatch
The intention of the special "cone mode" in the sparse-checkout
feature is to always match the same patterns that are matched by the
same sparse-checkout file as when cone mode is disabled.
When a file path is given to "git sparse-checkout set" in cone mode,
then the cone mode improperly matches the file as a recursive path.
When setting the skip-worktree bits, files were not expecting the
MATCHED_RECURSIVE response, and hence these were left out of the
matched cone.
Fix this bug by checking for MATCHED_RECURSIVE in addition to MATCHED
and add a test that prevents regression.
Reported-by: Finn Bryant <finnbryant@gmail.com>
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/technical/trivial-merge.txt')
0 files changed, 0 insertions, 0 deletions