summaryrefslogtreecommitdiff
path: root/t/t5100/info0006
diff options
context:
space:
mode:
authorLibravatar Elijah Newren <newren@gmail.com>2021-09-27 16:33:47 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-09-27 13:38:37 -0700
commit94b7f1563ace91af823125e5b8895cb24b2c0e4a (patch)
treeda1ad1d8d1f308523fc9b17559afa40f0fc8238a /t/t5100/info0006
parentunpack-trees: avoid nuking untracked dir in way of locally deleted file (diff)
downloadtgif-94b7f1563ace91af823125e5b8895cb24b2c0e4a.tar.xz
Comment important codepaths regarding nuking untracked files/dirs
In the last few commits we focused on code in unpack-trees.c that mistakenly removed untracked files or directories. There may be more of those, but in this commit we change our focus: callers of toplevel commands that are expected to remove untracked files or directories. As noted previously, we have toplevel commands that are expected to delete untracked files such as 'read-tree --reset', 'reset --hard', and 'checkout --force'. However, that does not mean that other highlevel commands that happen to call these other commands thought about or conveyed to users the possibility that untracked files could be removed. Audit the code for such callsites, and add comments near existing callsites to mention whether these are safe or not. My auditing is somewhat incomplete, though; it skipped several cases: * git-rebase--preserve-merges.sh: is in the process of being deprecated/removed, so I won't leave a note that there are likely more bugs in that script. * contrib/git-new-workdir: why is the -f flag being used in a new empty directory?? It shouldn't hurt, but it seems useless. * git-p4.py: Don't see why -f is needed for a new dir (maybe it's not and is just superfluous), but I'm not at all familiar with the p4 stuff * git-archimport.perl: Don't care; arch is long since dead * git-cvs*.perl: Don't care; cvs is long since dead Also, the reset --hard in builtin/worktree.c looks safe, due to only running in an empty directory. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5100/info0006')
0 files changed, 0 insertions, 0 deletions