aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-09-15 13:59:59 -0700
committerJunio C Hamano <gitster@pobox.com>2012-09-15 22:58:20 -0700
commitd2aea1371bc240a55f0b3c2265171a16ee023f2e (patch)
tree049393cd81af94d3d0f4a1ea2bcb4458114988f1
parent82a75299fa63a388a9a4823bcb687e50964d95fb (diff)
downloadgit-d2aea1371bc240a55f0b3c2265171a16ee023f2e.tar.gz
git-d2aea1371bc240a55f0b3c2265171a16ee023f2e.tar.xz
diff.c: mark a private file-scope symbol as static
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--diff.c2
-rw-r--r--diff.h1
2 files changed, 1 insertions, 2 deletions
diff --git a/diff.c b/diff.c
index e6846ca75..ddcdfed78 100644
--- a/diff.c
+++ b/diff.c
@@ -25,7 +25,7 @@
static int diff_detect_rename_default;
static int diff_rename_limit_default = 400;
static int diff_suppress_blank_empty;
-int diff_use_color_default = -1;
+static int diff_use_color_default = -1;
static const char *diff_word_regex_cfg;
static const char *external_diff_cmd_cfg;
int diff_auto_refresh_index = 1;
diff --git a/diff.h b/diff.h
index e25addb80..a658f85f2 100644
--- a/diff.h
+++ b/diff.h
@@ -243,7 +243,6 @@ extern int parse_long_opt(const char *opt, const char **argv,
extern int git_diff_basic_config(const char *var, const char *value, void *cb);
extern int git_diff_ui_config(const char *var, const char *value, void *cb);
-extern int diff_use_color_default;
extern void diff_setup(struct diff_options *);
extern int diff_opt_parse(struct diff_options *, const char **, int);
extern void diff_setup_done(struct diff_options *);