aboutsummaryrefslogtreecommitdiffstats
path: root/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-10-23 14:20:18 +0900
committerJunio C Hamano <gitster@pobox.com>2017-10-23 14:20:18 +0900
commit7186408f2486ebbb82736c15efb8fbc372fb5f95 (patch)
treeb17026dbf30f239cbb390e0ee33b109ef69b0370 /diff.c
parentMerge branch 'ma/ts-cleanups' into maint (diff)
parentALLOC_GROW: avoid -Wsign-compare warnings (diff)
downloadgit-7186408f2486ebbb82736c15efb8fbc372fb5f95.tar.gz
git-7186408f2486ebbb82736c15efb8fbc372fb5f95.zip
Merge branch 'rj/no-sign-compare' into maint
Many codepaths have been updated to squelch -Wsign-compare warnings. * rj/no-sign-compare: ALLOC_GROW: avoid -Wsign-compare warnings cache.h: hex2chr() - avoid -Wsign-compare warnings commit-slab.h: avoid -Wsign-compare warnings git-compat-util.h: xsize_t() - avoid -Wsign-compare warnings
Diffstat (limited to 'diff.c')
-rw-r--r--diff.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/diff.c b/diff.c
index 85e714f6c6..fa77b00492 100644
--- a/diff.c
+++ b/diff.c
@@ -828,7 +828,7 @@ static void emit_rewrite_diff(const char *name_a,
struct diff_words_buffer {
mmfile_t text;
- long alloc;
+ unsigned long alloc;
struct diff_words_orig {
const char *begin, *end;
} *orig;