From 273c7032e9e79613349e24db3b0e40e8b5c0c62c Mon Sep 17 00:00:00 2001 From: Ramsay Jones Date: Sun, 9 Oct 2011 18:33:34 +0100 Subject: [PATCH] environment.c: Fix an sparse "symbol not declared" warning In particular, sparse issues the following warning: environment.c:62:5: warning: symbol 'merge_log_config' was not \ declared. Should it be static? In order to supress the warning, we include the "fmt-merge-msg.h" header file, since it contains an appropriate extern declaration for the 'merge_log_config' variable. Signed-off-by: Ramsay Jones Signed-off-by: Junio C Hamano --- environment.c | 1 + 1 file changed, 1 insertion(+) diff --git a/environment.c b/environment.c index ba9781b71..4b7ecab8b 100644 --- a/environment.c +++ b/environment.c @@ -9,6 +9,7 @@ */ #include "cache.h" #include "refs.h" +#include "fmt-merge-msg.h" char git_default_email[MAX_GITNAME]; char git_default_name[MAX_GITNAME]; -- 2.30.2