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
This commit is contained in:
commit
d15644fe02
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user