summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRamsay Jones <ramsay@ramsay1.demon.co.uk>2011-10-09 18:33:34 +0100
committerJunio C Hamano <gitster@pobox.com>2011-10-09 13:20:54 -0700
commit273c7032e9e79613349e24db3b0e40e8b5c0c62c (patch)
treed09ed1df45bac3aedf436e65795ca4f0a98b808b
parent22a8699a6b1587024b884a80d88631db6a0ef511 (diff)
downloadgit-273c7032e9e79613349e24db3b0e40e8b5c0c62c.tar.gz
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>
-rw-r--r--environment.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/environment.c b/environment.c
index ba9781b713..4b7ecab8b5 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];