]> git.ipfire.org Git - thirdparty/git.git/commit - unpack-trees.c
unpack-trees: provide warnings on sparse updates for unmerged paths too
authorElijah Newren <newren@gmail.com>
Fri, 27 Mar 2020 00:48:59 +0000 (00:48 +0000)
committerJunio C Hamano <gitster@pobox.com>
Fri, 27 Mar 2020 18:33:30 +0000 (11:33 -0700)
commitebb568b9e2539ce2dbb3853ff3d4869a5c690601
tree11ada4c7681087704a1096edde0e38637172f5eb
parent22ab0b37d85080d8932e992e183b2f86e67bff19
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>
t/t1091-sparse-checkout-builtin.sh
unpack-trees.c
unpack-trees.h