summaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2016-03-11 22:37:14 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-03-11 23:02:23 (GMT)
commit652f18ee8734ffb4a98271e5020dfa550db0f37b (patch)
tree41ab2d1feb7931e2a4ef64a1f56ce89bba6d359d /cache.h
parent94ce167249781d2c80ba28412d853c426d41a55a (diff)
downloadgit-652f18ee8734ffb4a98271e5020dfa550db0f37b.zip
git-652f18ee8734ffb4a98271e5020dfa550db0f37b.tar.gz
git-652f18ee8734ffb4a98271e5020dfa550db0f37b.tar.bz2
setup: unify repository version callbacks
Once upon a time, check_repository_format_gently would parse the config with a single callback, and that callback would set up a bunch of global variables. But now that we have separate workdirs, we have to be more careful. Commit 31e26eb (setup.c: support multi-checkout repo setup, 2014-11-30) introduced a reduced callback which omits some values like core.worktree. In the "main" callback we call the reduced one, and then add back in the missing variables. Now that we have split the config-parsing from the munging of the global variables, we can do it all with a single callback, and keep all of the "are we in a separate workdir" logic together. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'cache.h')
-rw-r--r--cache.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/cache.h b/cache.h
index 4fc42b5..7704bc6 100644
--- a/cache.h
+++ b/cache.h
@@ -1582,7 +1582,6 @@ extern void git_config_set_multivar_in_file(const char *, const char *, const ch
extern int git_config_rename_section(const char *, const char *);
extern int git_config_rename_section_in_file(const char *, const char *, const char *);
extern const char *git_etc_gitconfig(void);
-extern int check_repository_format_version(const char *var, const char *value, void *cb);
extern int git_env_bool(const char *, int);
extern unsigned long git_env_ulong(const char *, unsigned long);
extern int git_config_system(void);