Skip to content

Commit 69f4da8

Browse files
chooglengitster
authored andcommitted
setup.c: don't setup in discover_git_directory()
discover_git_directory() started modifying the_repository in ebaf3bc (repository: move global r_f_p_c to repo struct, 2021-06-17), when, in the repository setup process, we started copying members from the "struct repository_format" we're inspecting to the appropriate "struct repository". However, discover_git_directory() isn't actually used in the setup process (its only caller in the Git binary is read_early_config()), so it shouldn't be doing this setup at all! As explained by 16ac8b8 (setup: introduce the discover_git_directory() function, 2017-03-13) and the comment on its declaration, discover_git_directory() is intended to be an entrypoint into setup.c machinery that allows the Git directory to be discovered without side effects, e.g. so that read_early_config() can read ".git/config" before the_repository has been set up. Fortunately, we didn't start to rely on this unintended behavior between then and now, so we let's just remove it. It isn't harming anyone, but it's confusing. Signed-off-by: Glen Choo <[email protected]> Acked-by: Johannes Schindelin <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent d7d8841 commit 69f4da8

File tree

1 file changed

+0
-5
lines changed

1 file changed

+0
-5
lines changed

setup.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1423,11 +1423,6 @@ int discover_git_directory(struct strbuf *commondir,
14231423
return -1;
14241424
}
14251425

1426-
/* take ownership of candidate.partial_clone */
1427-
the_repository->repository_format_partial_clone =
1428-
candidate.partial_clone;
1429-
candidate.partial_clone = NULL;
1430-
14311426
clear_repository_format(&candidate);
14321427
return 0;
14331428
}

0 commit comments

Comments
 (0)