]> git.ipfire.org Git - thirdparty/git.git/commit - t/t6436-merge-overwrite.sh
tests: remove leftover untracked files
authorElijah Newren <newren@gmail.com>
Sat, 11 Sep 2021 17:08:42 +0000 (17:08 +0000)
committerJunio C Hamano <gitster@pobox.com>
Sun, 12 Sep 2021 23:42:40 +0000 (16:42 -0700)
commitf222bd34ffde9e2fb06794bb657fd9dc371261df
treeac5daf0ebc83808be18435bba3c01c9de61702c8
parent8b7c11b8668b4e774f81a9f0b4c30144b818f1d1
tests: remove leftover untracked files

Remove untracked files that are unwanted after they are done being used.

While the set of cases in this patch is certainly far from
comprehensive, it was motivated by some work to see what the fallout
would be if we were to make the removal of untracked files as a side
effect of other commands into an error.  Some cases were a bit more
involved than the testcase changes included in this patch, but the ones
included here represent the simple cases.  While this patch is not that
important since we are not changing the behavior of those other commands
into an error in the near term, I thought these changes were useful
anyway as an explicit documentation of the intent that these untracked
files are no longer useful.

Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Acked-by: Derrick Stolee <stolee@gmail.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
12 files changed:
t/t0090-cache-tree.sh
t/t2021-checkout-overwrite.sh
t/t3404-rebase-interactive.sh
t/t3435-rebase-gpg-sign.sh
t/t3510-cherry-pick-sequence.sh
t/t5304-prune.sh
t/t6415-merge-dir-to-symlink.sh
t/t6424-merge-unrelated-index-changes.sh
t/t6430-merge-recursive.sh
t/t6436-merge-overwrite.sh
t/t7201-co.sh
t/t7600-merge.sh