git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: [PATCH 7/8] config: eliminate config_exclusive_filename
Date: Thu, 16 Feb 2012 03:09:32 -0500	[thread overview]
Message-ID: <20120216080932.GG11843@sigill.intra.peff.net> (raw)
In-Reply-To: <20120216080102.GA11793@sigill.intra.peff.net>

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>
---
This could be squashed into the last patch (really, all of the last few
patches could be squashed). But I was able to "git grep
config_exclusive_filename" at this state and see that yes, indeed, the
variable is now totally useless.

 cache.h  |    2 --
 config.c |   10 +++-------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/cache.h b/cache.h
index 7cb8874..411c60d 100644
--- a/cache.h
+++ b/cache.h
@@ -1150,8 +1150,6 @@ struct config_include_data {
 #define CONFIG_INCLUDE_INIT { 0 }
 extern int git_config_include(const char *name, const char *value, 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 fbf883d..e1d6857 100644
--- 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;
-
 #define MAX_INCLUDE_DEPTH 10
 static const char include_depth_advice[] =
 "exceeded maximum include depth (%d) while including\n"
@@ -1005,7 +1003,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);
 }
 
 /*
@@ -1504,8 +1502,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);
 }
 
@@ -1631,8 +1628,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);
 }
 
 /*
-- 
1.7.9.1.4.g8ffed

  parent reply	other threads:[~2012-02-16  8:09 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-02-13 20:42 What's cooking in git.git (Feb 2012, #05; Mon, 13) Junio C Hamano
2012-02-14  7:22 ` An incremental update to "What's cooking" Junio C Hamano
2012-02-14 21:47 ` What's cooking in git.git (Feb 2012, #05; Mon, 13) Jeff King
2012-02-14 22:05   ` Junio C Hamano
2012-02-14 22:09     ` Jeff King
2012-02-16  8:01       ` [PATCH 0/8] config-include fixes Jeff King
2012-02-16  8:02         ` [PATCH 1/8] t1300: add missing &&-chaining Jeff King
2012-02-16  8:03         ` [PATCH 2/8] config: copy the return value of prefix_filename Jeff King
2012-02-16  8:04         ` [PATCH 3/8] config: teach git_config_set_multivar_in_file a default path Jeff King
2012-02-16  8:04         ` [PATCH 4/8] config: teach git_config_rename_section a file argument Jeff King
2012-02-16  8:05         ` [PATCH 5/8] config: provide a version of git_config with more options Jeff King
2012-02-16  8:07         ` [PATCH 6/8] config: stop using config_exclusive_filename Jeff King
2012-02-16  8:09         ` Jeff King [this message]
2012-02-16  8:10         ` [PATCH 8/8] config: do not respect includes for single-file --list Jeff King
2012-02-16 20:11         ` [PATCH 0/8] config-include fixes Junio C Hamano
2012-02-17  0:14           ` Jeff King
2012-02-17  2:50             ` Junio C Hamano
2012-02-17  3:17               ` Jeff King
2012-02-17  3:23                 ` Jeff King
2012-02-17  8:17                   ` [PATCH 0/2] api-config documentation leftovers Jeff King
2012-02-17 17:04                     ` Junio C Hamano
2012-02-17  8:18                   ` [PATCH 1/2] docs/api-config: minor clarifications Jeff King
2012-02-17  8:18                   ` [PATCH 2/2] docs/api-config: describe git_config_with_options Jeff King

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20120216080932.GG11843@sigill.intra.peff.net \
    --to=peff@peff.net \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).