summaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-06-01 21:05:22 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-06-01 21:05:22 (GMT)
commit1c6e3514d093377fec5e30aa02a119187cf743f2 (patch)
treefe3865b32c4690dce137a173d86f3876578cf02c /cache.h
parent6e1a7510b1dd830de69e174e409a40eb580c3ba7 (diff)
parent73546c085d49694c5e54b421f80bde6bc25006fb (diff)
downloadgit-1c6e3514d093377fec5e30aa02a119187cf743f2.zip
git-1c6e3514d093377fec5e30aa02a119187cf743f2.tar.gz
git-1c6e3514d093377fec5e30aa02a119187cf743f2.tar.bz2
Merge branch 'jk/maint-config-alias-fix' into maint
* jk/maint-config-alias-fix: handle_options(): do not miscount how many arguments were used config: always parse GIT_CONFIG_PARAMETERS during git_config git_config: don't peek at global config_parameters config: make environment parsing routines static
Diffstat (limited to 'cache.h')
-rw-r--r--cache.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/cache.h b/cache.h
index dd34fed..ce73e1f 100644
--- a/cache.h
+++ b/cache.h
@@ -1007,8 +1007,6 @@ typedef int (*config_fn_t)(const char *, const char *, void *);
extern int git_default_config(const char *, const char *, void *);
extern int git_config_from_file(config_fn_t fn, const char *, void *);
extern void git_config_push_parameter(const char *text);
-extern int git_config_parse_parameter(const char *text);
-extern int git_config_parse_environment(void);
extern int git_config_from_parameters(config_fn_t fn, void *data);
extern int git_config(config_fn_t fn, void *);
extern int git_config_early(config_fn_t fn, void *, const char *repo_config);