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>
Jeff King committed
Feb 16, 2012 at 03:09 UTC
4a7bb5ba950f08d1e46c4bd2e8b1c903b4d024c8
2 files changed
+3
-9
cache.h
-2
@@ -1140,8 +1140,6 @@ extern const char *get_commit_output_encoding(void);
1140
1141
extern int git_config_parse_parameter(const char *, config_fn_t fn, void *data);
1142
1143
-extern const char *config_exclusive_filename;
1144
-
1143
#define MAX_GITNAME (1000)
1144
extern char git_default_email[MAX_GITNAME];
1145
extern char git_default_name[MAX_GITNAME];
config.c
+3
-7
@@ -26,8 +26,6 @@ static config_file *cf;
26
27
static int zlib_compression_seen;
28
29
-const char *config_exclusive_filename = NULL;
30
-
29
static void lowercase(char *p)
30
{
31
for (; *p; p++)
@@ -936,7 +934,7 @@ int git_config_with_options(config_fn_t fn, void *data,
934
935
int git_config(config_fn_t fn, void *data)
936
{
939
- return git_config_with_options(fn, data, config_exclusive_filename);
937
+ return git_config_with_options(fn, data, NULL);
938
}
939
940
/*
@@ -1435,8 +1433,7 @@ write_err_out:
1433
int git_config_set_multivar(const char *key, const char *value,
1434
const char *value_regex, int multi_replace)
1435
{
1438
- return git_config_set_multivar_in_file(config_exclusive_filename,
1439
- key, value, value_regex,
1436
+ return git_config_set_multivar_in_file(NULL, key, value, value_regex,
1437
multi_replace);
1438
}
1439
@@ -1562,8 +1559,7 @@ out:
1559
1560
int git_config_rename_section(const char *old_name, const char *new_name)
1561
{
1565
- return git_config_rename_section_in_file(config_exclusive_filename,
1566
- old_name, new_name);
1562
+ return git_config_rename_section_in_file(NULL, old_name, new_name);
1563
}
1564
1565
/*