@matheusbsbs / matheus-bagliano / commits / 0b0ee3388c

unpack-trees: add special cwd handling

When running commands such as `git reset --hard` from a subdirectory, if that subdirectory is in the way of adding needed files, bail with an error message. Note that this change looks kind of like it duplicates the new lines of code from the previous commit in verify_clean_subdirectory(). However, when we are preserving untracked files, we would rather any error messages about untracked files being in the way take precedence over error messages about a subdirectory that happens to be the_original_cwd being in the way. But in the UNPACK_RESET_OVERWRITE_UNTRACKED case, there is no untracked checking to be done, so we simply add a special case near the top of verify_absent_1. Acked-by: Derrick Stolee <stolee@gmail.com> Acked-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Elijah Newren committed Dec 9, 2021 at 05:08 UTC 0b0ee3388cf080c4200c235ee699bd95c960c167

2 files changed +12 -3

t/t2501-cwd-empty.sh

+1 -1

@@ -121,7 +121,7 @@ test_expect_success 'reset --hard does not clean cwd incidentally' '

121 '

122

123 test_expect_success 'reset --hard fails if cwd needs to be removed' '

124 - test_required_dir_removal failure git reset --hard fd_conflict

124 + test_required_dir_removal success git reset --hard fd_conflict

125 '

126

127 test_expect_success 'merge does not clean cwd incidentally' '

unpack-trees.c

+11 -2

@@ -2261,10 +2261,19 @@ static int verify_absent_1(const struct cache_entry *ce,

2261 int len;

2262 struct stat st;

2263

2264 - if (o->index_only || !o->update ||

2265 - o->reset == UNPACK_RESET_OVERWRITE_UNTRACKED)

2264 + if (o->index_only || !o->update)

2265 return 0;

2266

2267 + if (o->reset == UNPACK_RESET_OVERWRITE_UNTRACKED) {

2268 + /* Avoid nuking startup_info->original_cwd... */

2269 + if (startup_info->original_cwd &&

2270 + !strcmp(startup_info->original_cwd, ce->name))

2271 + return add_rejected_path(o, ERROR_CWD_IN_THE_WAY,

2272 + ce->name);

2273 + /* ...but nuke anything else. */

2274 + return 0;

2275 + }

2276 +

2277 len = check_leading_path(ce->name, ce_namelen(ce), 0);

2278 if (!len)

2279 return 0;