From dc29ddebb969af489cdfd5dbbf424710973ef62f Mon Sep 17 00:00:00 2001 From: Johannes Sixt Date: Tue, 9 Aug 2016 16:16:33 +0200 Subject: [PATCH] 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 Signed-off-by: Junio C Hamano --- builtin/config.c | 1 - 1 file changed, 1 deletion(-) 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; -- 2.47.1