summaryrefslogtreecommitdiff
path: root/builtin/config.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-08-10 19:33:20 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-08-10 19:33:20 (GMT)
commit7a3ea666331cd6cf8d9a7a15aafc33459b8c571c (patch)
treebdd9065ea6c5010d136e3ca59bf59c1ea68adb24 /builtin/config.c
parent483ca933f8fee1e9264aeef71f48f086e7cc70db (diff)
parentaf920e369778a4cc42519ef523131d29451bf79b (diff)
downloadgit-7a3ea666331cd6cf8d9a7a15aafc33459b8c571c.zip
git-7a3ea666331cd6cf8d9a7a15aafc33459b8c571c.tar.gz
git-7a3ea666331cd6cf8d9a7a15aafc33459b8c571c.tar.bz2
Merge branch 'js/commit-slab-decl-fix'
* js/commit-slab-decl-fix: commit-slab.h: avoid duplicated global static variables config.c: avoid duplicated global static variables
Diffstat (limited to 'builtin/config.c')
-rw-r--r--builtin/config.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/builtin/config.c b/builtin/config.c
index a991a53..6cbf733 100644
--- a/builtin/config.c
+++ b/builtin/config.c
@@ -25,7 +25,6 @@ static char term = '\n';
static int use_global_config, use_system_config, use_local_config;
static struct git_config_source given_config_source;
static int actions, types;
-static const char *get_color_slot, *get_colorbool_slot;
static int end_null;
static int respect_includes = -1;
static int show_origin;