summaryrefslogtreecommitdiff
path: root/config.c
diff options
context:
space:
mode:
authorRamsay Jones <ramsay@ramsay1.demon.co.uk>2011-05-31 17:23:42 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-05-31 17:51:18 (GMT)
commit766d6268c6af14970744f69c574e4b34ec056106 (patch)
treea30f19dded63272e5c22f9ee448aed63da6c532f /config.c
parentd98a20114d641789e1c886f6c26e63d91132f5da (diff)
downloadgit-766d6268c6af14970744f69c574e4b34ec056106.zip
git-766d6268c6af14970744f69c574e4b34ec056106.tar.gz
git-766d6268c6af14970744f69c574e4b34ec056106.tar.bz2
config.c: Remove unused git_config_global() function
Commit 8f323c00 (drop support for GIT_CONFIG_NOGLOBAL, 15-03-2011) removed the git_config_global() function, among other things, since it is no longer required. Unfortunately, this function has since been unintentionally restored by a faulty conflict resolution. Remove it. Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'config.c')
-rw-r--r--config.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/config.c b/config.c
index a8267e9..e0b3b80 100644
--- a/config.c
+++ b/config.c
@@ -825,11 +825,6 @@ int git_config_system(void)
return !git_env_bool("GIT_CONFIG_NOSYSTEM", 0);
}
-int git_config_global(void)
-{
- return !git_env_bool("GIT_CONFIG_NOGLOBAL", 0);
-}
-
int git_config_early(config_fn_t fn, void *data, const char *repo_config)
{
int ret = 0, found = 0;