environment.h: move declarations for environment.c functions from cache.h

[thirdparty/git.git] / range-diff.c

diff --git a/range-diff.c b/range-diff.c
index 086365dffb7e42de0158cfb9cd64c218571c2ba2..815fb24c9cef9982c5e3366d4de15ca559d96866 100644 (file)
--- a/range-diff.c
+++ b/range-diff.c
@@ -1,4 +1,6 @@
 #include "cache.h"
+#include "environment.h"
+#include "gettext.h"
 #include "range-diff.h"
 #include "string-list.h"
 #include "run-command.h"
@@ -383,7 +385,7 @@ static void output_pair_header(struct diff_options *diffopt,
        const char *color_new = diff_get_color_opt(diffopt, DIFF_FILE_NEW);
        const char *color_commit = diff_get_color_opt(diffopt, DIFF_COMMIT);
        const char *color;
-       char abbrev = diffopt->abbrev;
+       int abbrev = diffopt->abbrev;
 
        if (abbrev < 0)
                abbrev = DEFAULT_ABBREV;