diff options
author | Elijah Newren <newren@gmail.com> | 2020-03-27 03:48:59 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-03-27 21:33:30 +0300 |
commit | ebb568b9e2539ce2dbb3853ff3d4869a5c690601 (patch) | |
tree | 11ada4c7681087704a1096edde0e38637172f5eb /repository.c | |
parent | 22ab0b37d85080d8932e992e183b2f86e67bff19 (diff) |
unpack-trees: provide warnings on sparse updates for unmerged paths too
When sparse-checkout runs to update the list of sparsity patterns, it
gives warnings if it can't remove paths from the working tree because
those files have dirty changes. Add a similar warning for unmerged
paths as well.
Reviewed-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'repository.c')
0 files changed, 0 insertions, 0 deletions