From: Junio C Hamano Date: Wed, 13 Oct 2021 22:15:57 +0000 (-0700) Subject: Merge branch 'en/removing-untracked-fixes' X-Git-Tag: v2.34.0-rc0~63 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a7c2daa06d6f7d8fd13a1d72f23741acbaeba522;p=thirdparty%2Fgit.git Merge branch 'en/removing-untracked-fixes' Various fixes in code paths that move untracked files away to make room. * en/removing-untracked-fixes: Documentation: call out commands that nuke untracked files/directories Comment important codepaths regarding nuking untracked files/dirs unpack-trees: avoid nuking untracked dir in way of locally deleted file unpack-trees: avoid nuking untracked dir in way of unmerged file Change unpack_trees' 'reset' flag into an enum Remove ignored files by default when they are in the way unpack-trees: make dir an internal-only struct unpack-trees: introduce preserve_ignored to unpack_trees_options read-tree, merge-recursive: overwrite ignored files by default checkout, read-tree: fix leak of unpack_trees_options.dir t2500: add various tests for nuking untracked files --- a7c2daa06d6f7d8fd13a1d72f23741acbaeba522