@matheusbsbs / matheus-bagliano / commits / b413a82712

unpack-trees: heed requests to overwrite ignored files

When a directory exists but has only ignored files within it and we are trying to switch to a branch that has a file where that directory is, the behavior depends upon --[no]-overwrite-ignore. If the user wants to --overwrite-ignore (the default), then we should delete the ignored file and directory and switch to the new branch. The code to handle this in verify_clean_subdirectory() in unpack-trees tried to handle this via paying attention to the exclude_per_dir setting of the internal dir field. This came from commit c81935348b ("Fix switching to a branch with D/F when current branch has file D.", 2007-03-15), which pre-dated 039bc64e88 ("core.excludesfile clean-up", 2007-11-14), and thus did not pay attention to ignore patterns from other relevant files. Change it to use setup_standard_excludes() so that it is also aware of excludes specified in other locations. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Elijah Newren committed Feb 27, 2023 at 15:28 UTC b413a827126abd54fa95470be7c63fa4f00d5d47
2 files changed +12 -1
t/t2021-checkout-overwrite.sh
+11
@@ -69,4 +69,15 @@ test_expect_success SYMLINKS 'checkout -f must not follow symlinks when removing
69 test_path_is_file untracked/f
70 '
71
72 +test_expect_success 'checkout --overwrite-ignore should succeed if only ignored files in the way' '
73 + git checkout -b df_conflict &&
74 + test_commit contents some_dir &&
75 + git checkout start &&
76 + mkdir some_dir &&
77 + echo autogenerated information >some_dir/ignore &&
78 + echo ignore >.git/info/exclude &&
79 + git checkout --overwrite-ignore df_conflict &&
80 + ! test_path_is_dir some_dir
81 +'
82 +
83 test_done
unpack-trees.c
+1 -1
@@ -2337,7 +2337,7 @@ static int verify_clean_subdirectory(const struct cache_entry *ce,
2337
2338 memset(&d, 0, sizeof(d));
2339 if (o->dir)
2340 - d.exclude_per_dir = o->dir->exclude_per_dir;
2340 + setup_standard_excludes(&d);
2341 i = read_directory(&d, o->src_index, pathbuf, namelen+1, NULL);
2342 dir_clear(&d);
2343 free(pathbuf);