summaryrefslogtreecommitdiff
path: root/setup.c
diff options
context:
space:
mode:
authorbrian m. carlson <sandals@crustytoothpaste.net>2020-02-22 20:17:37 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-02-24 17:33:27 (GMT)
commitcfe3917c85f38c3367de7b6f5838ecaf6d1e148d (patch)
tree154e3c9ae4054961396971c09a36512c8c4d559a /setup.c
parentbf154a878281b6a971ece0fb6d917938298be60d (diff)
downloadgit-cfe3917c85f38c3367de7b6f5838ecaf6d1e148d.zip
git-cfe3917c85f38c3367de7b6f5838ecaf6d1e148d.tar.gz
git-cfe3917c85f38c3367de7b6f5838ecaf6d1e148d.tar.bz2
setup: allow check_repository_format to read repository format
In some cases, we will want to not only check the repository format, but extract the information that we've gained. To do so, allow check_repository_format to take a pointer to struct repository_format. Allow passing NULL for this argument if we're not interested in the information, and pass NULL for all existing callers. A future patch will make use of this information. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'setup.c')
-rw-r--r--setup.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/setup.c b/setup.c
index 4ea7a0b..af20c3d 100644
--- a/setup.c
+++ b/setup.c
@@ -1253,10 +1253,12 @@ int git_config_perm(const char *var, const char *value)
return -(i & 0666);
}
-void check_repository_format(void)
+void check_repository_format(struct repository_format *fmt)
{
struct repository_format repo_fmt = REPOSITORY_FORMAT_INIT;
- check_repository_format_gently(get_git_dir(), &repo_fmt, NULL);
+ if (!fmt)
+ fmt = &repo_fmt;
+ check_repository_format_gently(get_git_dir(), fmt, NULL);
startup_info->have_repository = 1;
clear_repository_format(&repo_fmt);
}