diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-09-13 21:38:24 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-09-13 21:38:24 +0300 |
| commit | e4ffba458fd173949ae04f77b8165c3c061f183e (patch) | |
| tree | 8c7bbd68bd18121579381545e76c4479134c32f3 /add-patch.c | |
| parent | 76ffa818c792cf3508502f78909c3b7eb3c72dbc (diff) | |
| parent | 64ec8efb836c5def807feb5d86be50f4f53a7b33 (diff) | |
Merge branch 'js/builtin-add-p-portability-fix'
More fixes to "add -p"
* js/builtin-add-p-portability-fix:
t6132(NO_PERL): do not run the scripted `add -p`
t3701: test the built-in `add -i` regardless of NO_PERL
add -p: avoid ambiguous signed/unsigned comparison
Diffstat (limited to 'add-patch.c')
| -rw-r--r-- | add-patch.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/add-patch.c b/add-patch.c index a659653286..29f9456df3 100644 --- a/add-patch.c +++ b/add-patch.c @@ -1560,7 +1560,7 @@ soft_increment: strbuf_remove(&s->answer, 0, 1); strbuf_trim(&s->answer); i = hunk_index - DISPLAY_HUNKS_LINES / 2; - if (i < file_diff->mode_change) + if (i < (int)file_diff->mode_change) i = file_diff->mode_change; while (s->answer.len == 0) { i = display_hunks(s, file_diff, i); |