diff options
| author | René Scharfe <l.s.r@web.de> | 2023-02-28 17:13:27 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-02-28 23:43:05 +0100 |
| commit | d9165bef5810df216e0eb4fac62d59cbf19446e4 (patch) | |
| tree | 3a9bd27a88058a44470654572e111a55e13d83bd /range-diff.c | |
| parent | range-diff: let '--abbrev' option takes effect (diff) | |
| download | git-d9165bef5810df216e0eb4fac62d59cbf19446e4.tar.xz git-d9165bef5810df216e0eb4fac62d59cbf19446e4.zip | |
range-diff: avoid compiler warning when char is unsigned
Since 2b15969f61 (range-diff: let '--abbrev' option takes effect,
2023-02-20), GCC 11.3 on Ubuntu 22.04 on aarch64 warns (and errors
out if the make variable DEVELOPER is set):
range-diff.c: In function ‘output_pair_header’:
range-diff.c:388:20: error: comparison is always false due to limited range of data type [-Werror=type-limits]
388 | if (abbrev < 0)
| ^
cc1: all warnings being treated as errors
That's because char is unsigned on that platform. Use int instead, just
like in struct diff_options, to copy the value faithfully.
Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to '')
| -rw-r--r-- | range-diff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/range-diff.c b/range-diff.c index 086365dffb..4bd65ab749 100644 --- a/range-diff.c +++ b/range-diff.c @@ -383,7 +383,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; |