Skip to content

Commit

Permalink
environment.c: Fix an sparse "symbol not declared" warning
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Ramsay Jones authored and Junio C Hamano committed Oct 9, 2011
1 parent 22a8699 commit 273c703
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions environment.c
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand Down

0 comments on commit 273c703

Please sign in to comment.