config: eliminate config_exclusive_filename

This is a magic global variable that was intended as an
override to the usual git-config lookup process. Once upon a
time, you could specify GIT_CONFIG to any git program, and
it would look only at that file. This turned out to be
confusing and cause a lot of bugs for little gain. As a
result, dc87183 (Only use GIT_CONFIG in "git config", not
other programs, 2008-06-30) took this away for all callers
except git-config.

Since git-config no longer uses it either, the variable can
just go away. As the diff shows, nobody was setting to
anything except NULL, so we can just replace any sites where
it was read with NULL.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/cache.h b/cache.h
index 604236a28f59f61aa3800a000ebb47ac40e09d9b..52d2c1e5844ea7354daee81cbb150580f227da35 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -1140,8 +1140,6 @@ extern const char *get_commit_output_encoding(void);
 
 extern int git_config_parse_parameter(const char *, config_fn_t fn, void *data);
 
-extern const char *config_exclusive_filename;
-
 #define MAX_GITNAME (1000)
 extern char git_default_email[MAX_GITNAME];
 extern char git_default_name[MAX_GITNAME];

diff --git a/config.c b/config.c
index 531d4d43e7de4780eb03c6a708fc942dc2492c8e..1e30ad9d18dc51eeaee72e33b6cc133e6ead1c99 100644 (file)
--- a/config.c
+++ b/config.c
@@ -26,8 +26,6 @@ static config_file *cf;
 
 static int zlib_compression_seen;
 
-const char *config_exclusive_filename = NULL;
-
 static void lowercase(char *p)
 {
        for (; *p; p++)
@@ -936,7 +934,7 @@ int git_config_with_options(config_fn_t fn, void *data,
 
 int git_config(config_fn_t fn, void *data)
 {
-       return git_config_with_options(fn, data, config_exclusive_filename);
+       return git_config_with_options(fn, data, NULL);
 }
 
 /*
@@ -1435,8 +1433,7 @@ write_err_out:
 int git_config_set_multivar(const char *key, const char *value,
                        const char *value_regex, int multi_replace)
 {
-       return git_config_set_multivar_in_file(config_exclusive_filename,
-                                              key, value, value_regex,
+       return git_config_set_multivar_in_file(NULL, key, value, value_regex,
                                               multi_replace);
 }
 
@@ -1562,8 +1559,7 @@ out:
 
 int git_config_rename_section(const char *old_name, const char *new_name)
 {
-       return git_config_rename_section_in_file(config_exclusive_filename,
-                                                old_name, new_name);
+       return git_config_rename_section_in_file(NULL, old_name, new_name);
 }
 
 /*