summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Sixt <j6t@kdbg.org>2016-08-09 16:16:33 +0200
committerJunio C Hamano <gitster@pobox.com>2016-08-09 10:19:24 -0700
commitdc29ddebb969af489cdfd5dbbf424710973ef62f (patch)
tree09dc56ce63f211fd890fa5087c1bd54de69c0927
parent765428699a5381f113d19974720bc91b5bfeaf1d (diff)
downloadgit-dc29ddebb969af489cdfd5dbbf424710973ef62f.tar.gz
config.c: avoid duplicated global static variables
Repeating the definition of a static variable seems to be valid in C. Nevertheless, it is bad style because it can cause confusion, definitely when it becomes necessary to change the type. d64ec16 (git config: reorganize to use parseopt, 2009-02-21) added two static variables near the top of the file config.c without removing the definitions of the two variables that occurs later in the file. The two variables were needed earlier in the file in the newly introduced parseopt structure. These references were removed later in d0e08d6 (config: fix parsing of "git config --get-color some.key -1", 2014-11-20). Remove the redundant, younger, definitions near the top of the file and keep the original definitions that occur later. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--builtin/config.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/builtin/config.c b/builtin/config.c
index a58f99c2d7..e4d96313d7 100644
--- a/builtin/config.c
+++ b/builtin/config.c
@@ -23,7 +23,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;