aboutsummaryrefslogtreecommitdiffstats
path: root/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-09-29 11:23:42 +0900
committerJunio C Hamano <gitster@pobox.com>2017-09-29 11:23:42 +0900
commit14a8168e2fed3934f1f9afb286f1c64345d06790 (patch)
treefc622bb0da0f89762a03bf6bb17b3bdc66e7eb92 /diff.c
parentMerge branch 'sb/merge-commit-msg-hook' (diff)
parentALLOC_GROW: avoid -Wsign-compare warnings (diff)
downloadgit-14a8168e2fed3934f1f9afb286f1c64345d06790.tar.gz
git-14a8168e2fed3934f1f9afb286f1c64345d06790.zip
Merge branch 'rj/no-sign-compare'
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 3c6a3e0faa..4da0714cb5 100644
--- a/diff.c
+++ b/diff.c
@@ -1541,7 +1541,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;