diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-03-02 00:25:24 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-03-02 00:25:24 +0300 |
| commit | d15644fe0226af7ffc874572d968598564a230dd (patch) | |
| tree | 89740bd1aba50354a41b966e7d43fdaf0caa824c | |
| parent | ef7d4f53c2fd9e8186d093dea6d45a91ce57110e (diff) | |
| parent | d9165bef5810df216e0eb4fac62d59cbf19446e4 (diff) | |
Merge branch 'rs/range-diff-custom-abbrev-fix'
Hotfix for a topic that is already in 'master'.
* rs/range-diff-custom-abbrev-fix:
range-diff: avoid compiler warning when char is unsigned
| -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; |