From 8b1fa778676ae94f7a6d4113fa90947b548154dd Mon Sep 17 00:00:00 2001 From: Alex Riesen Date: Fri, 26 Mar 2010 23:53:57 +0100 Subject: Allow passing of configuration parameters in the command line The values passed this way will override whatever is defined in the config files. Signed-off-by: Alex Riesen Signed-off-by: Junio C Hamano --- cache.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'cache.h') diff --git a/cache.h b/cache.h index 89f6a40d1a..4a0c75da7e 100644 --- a/cache.h +++ b/cache.h @@ -932,6 +932,8 @@ extern int update_server_info(int); 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 int git_config_parse_parameter(const char *text); +extern int git_config_from_parameters(); extern int git_config(config_fn_t fn, void *); extern int git_parse_ulong(const char *, unsigned long *); extern int git_config_int(const char *, const char *); -- cgit v1.2.1 From b3d83d9f2ef1b0f0f53bb7254e234c743aa42817 Mon Sep 17 00:00:00 2001 From: Thomas Rast Date: Fri, 21 May 2010 12:07:47 +0200 Subject: Complete prototype of git_config_from_parameters() Add the missing argument list. (Its lack triggered a compiler warning for me.) Signed-off-by: Thomas Rast Acked-by: Alex Riesen Signed-off-by: Junio C Hamano --- cache.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cache.h') diff --git a/cache.h b/cache.h index 4a0c75da7e..73f0f7b098 100644 --- a/cache.h +++ b/cache.h @@ -933,7 +933,7 @@ 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 int git_config_parse_parameter(const char *text); -extern int git_config_from_parameters(); +extern int git_config_from_parameters(config_fn_t fn, void *data); extern int git_config(config_fn_t fn, void *); extern int git_parse_ulong(const char *, unsigned long *); extern int git_config_int(const char *, const char *); -- cgit v1.2.1