]> git.ipfire.org Git - thirdparty/git.git/commit - unpack-trees.c
unpack-trees: avoid nuking untracked dir in way of locally deleted file
authorElijah Newren <newren@gmail.com>
Mon, 27 Sep 2021 16:33:46 +0000 (16:33 +0000)
committerJunio C Hamano <gitster@pobox.com>
Mon, 27 Sep 2021 20:38:37 +0000 (13:38 -0700)
commit56d06fe4aa9089bccb4ff247fc3224fc7431c72d
tree328fc04618ea1dafbe88feb3e05bfd6375ad8aba
parent1fdd51aa13c27403c37b57ead32ef79b81d8128b
unpack-trees: avoid nuking untracked dir in way of locally deleted file

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t2500-untracked-overwriting.sh
unpack-trees.c