diff --git a/environment.c b/environment.c index 76ee65e62b..f5628b6758 100644 --- a/environment.c +++ b/environment.c @@ -119,23 +119,23 @@ int is_bare_repository(struct repository *repo) int repo_protect_ntfs(struct repository *repo) { - return (repo && repo->initialized) ? - repo_config_values(repo)->protect_ntfs : - PROTECT_NTFS_DEFAULT; + return repo->initialized + ? repo_config_values(repo)->protect_ntfs + : PROTECT_NTFS_DEFAULT; } int repo_protect_hfs(struct repository *repo) { - return (repo && repo->initialized) ? - repo_config_values(repo)->protect_hfs : - PROTECT_HFS_DEFAULT; + return repo->initialized + ? repo_config_values(repo)->protect_hfs + : PROTECT_HFS_DEFAULT; } int repo_ignore_case(struct repository *repo) { - return (repo && repo->initialized) ? - repo_config_values(repo)->ignore_case : - 0; + return repo->initialized + ? repo_config_values(repo)->ignore_case + : 0; } int repo_trust_executable_bit(struct repository *repo) diff --git a/environment.h b/environment.h index e7ec5b0437..67fd387d35 100644 --- a/environment.h +++ b/environment.h @@ -115,7 +115,6 @@ enum object_creation_mode { }; struct repo_config_values { - /* section "core" config values */ char *attributes_file; char *excludes_file; char *editor_program; @@ -139,11 +138,7 @@ struct repo_config_values { int ignore_case; int trust_executable_bit; int has_symlinks; - - /* section "sparse" config values */ int sparse_expect_files_outside_of_patterns; - - /* section "branch" config values */ enum branch_track branch_track; }; @@ -175,22 +170,15 @@ int git_default_core_config(const char *var, const char *value, const struct config_context *ctx, void *cb); /* - * Getters for the `protect_hfs` and `protect_ntfs` fields of `struct repo_config_values`. - * They check `repo->initialized` to prevent calling `repo_config_values()` - * before the repository setup is fully complete or in non-git environments. + * Getters for configuration variables in `struct repo_config_values`. + * These functions require a non-NULL repository pointer and handle + * repositories that are not fully initialized by returning appropriate + * default values. */ int repo_protect_hfs(struct repository *repo); int repo_protect_ntfs(struct repository *repo); - -/* - * Getter for the `ignore_case` field of `struct repo_config_values`. - * It checks `repo->initialized` to prevent calling repo_config_values()` - * before the repository setup is fully complete or in non-git environments. - */ int repo_ignore_case(struct repository *repo); - int repo_trust_executable_bit(struct repository *repo); - int repo_has_symlinks(struct repository *repo); const char *repo_excludes_file(struct repository *repo);