From 56d06fe4aa9089bccb4ff247fc3224fc7431c72d Mon Sep 17 00:00:00 2001 From: Elijah Newren Date: Mon, 27 Sep 2021 16:33:46 +0000 Subject: unpack-trees: avoid nuking untracked dir in way of locally deleted file Signed-off-by: Elijah Newren Signed-off-by: Junio C Hamano --- unpack-trees.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'unpack-trees.c') diff --git a/unpack-trees.c b/unpack-trees.c index 821f532c85..48ca93a725 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -2409,7 +2409,10 @@ static int deleted_entry(const struct cache_entry *ce, if (verify_absent(ce, ERROR_WOULD_LOSE_UNTRACKED_REMOVED, o)) return -1; return 0; + } else if (verify_absent_if_directory(ce, ERROR_WOULD_LOSE_UNTRACKED_REMOVED, o)) { + return -1; } + if (!(old->ce_flags & CE_CONFLICTED) && verify_uptodate(old, o)) return -1; add_entry(o, ce, CE_REMOVE, 0); -- cgit v1.2.3