From: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Date: Sun, 9 Oct 2011 17:33:34 +0000 (+0100)
Subject: environment.c: Fix an sparse "symbol not declared" warning
X-Git-Tag: v1.7.9-rc0~37^2~4
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=273c7032e9e79613349e24db3b0e40e8b5c0c62c;p=git.git

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>
---

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];