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 <ramsay@ramsay1.demon.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ramsay Jones committed
Oct 9, 2011 at 18:33 UTC
273c7032e9e79613349e24db3b0e40e8b5c0c62c
1 file changed
+1
environment.c
+1
@@ -9,6 +9,7 @@
9
*/
10
#include "cache.h"
11
#include "refs.h"
12
+#include "fmt-merge-msg.h"
13
14
char git_default_email[MAX_GITNAME];
15
char git_default_name[MAX_GITNAME];