averello/git-mirror
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2025-12-12 20:36:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

unpack-trees: provide warnings on sparse updates for unmerged paths too

Browse Source 
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>
This commit is contained in:
Elijah Newren
2020-03-27 00:48:59 +00:00
committed by Junio C Hamano
parent 22ab0b37d8
commit ebb568b9e2
3 changed files with 56 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
unpack-trees.h
View File

@@ -27,6 +27,7 @@ enum unpack_trees_error_types {
NB_UNPACK_TREES_ERROR_TYPES,
WARNING_SPARSE_NOT_UPTODATE_FILE,
WARNING_SPARSE_UNMERGED_FILE,
WARNING_SPARSE_ORPHANED_NOT_OVERWRITTEN,
NB_UNPACK_TREES_WARNING_TYPES,