diff options
| author | Patrick Steinhardt <ps@pks.im> | 2024-12-06 11:27:24 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-12-06 20:20:04 +0900 |
| commit | 80c9e70ebe871f0826bc101142c66ff783405100 (patch) | |
| tree | c95f04cef2dc0abb2d1fe8e4470e9e385e637b12 /merge.c | |
| parent | pkt-line: fix -Wsign-compare warning on 32 bit platform (diff) | |
| download | git-80c9e70ebe871f0826bc101142c66ff783405100.tar.gz git-80c9e70ebe871f0826bc101142c66ff783405100.zip | |
global: trivial conversions to fix `-Wsign-compare` warnings
We have a bunch of loops which iterate up to an unsigned boundary using
a signed index, which generates warnigs because we compare a signed and
unsigned value in the loop condition. Address these sites for trivial
cases and enable `-Wsign-compare` warnings for these code units.
This patch only adapts those code units where we can drop the
`DISABLE_SIGN_COMPARE_WARNINGS` macro in the same step.
Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge.c')
| -rw-r--r-- | merge.c | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -1,5 +1,4 @@ #define USE_THE_REPOSITORY_VARIABLE -#define DISABLE_SIGN_COMPARE_WARNINGS #include "git-compat-util.h" #include "gettext.h" @@ -26,11 +25,11 @@ int try_merge_command(struct repository *r, const char *head_arg, struct commit_list *remotes) { struct child_process cmd = CHILD_PROCESS_INIT; - int i, ret; + int ret; struct commit_list *j; strvec_pushf(&cmd.args, "merge-%s", strategy); - for (i = 0; i < xopts_nr; i++) + for (size_t i = 0; i < xopts_nr; i++) strvec_pushf(&cmd.args, "--%s", xopts[i]); for (j = common; j; j = j->next) strvec_push(&cmd.args, merge_argument(j->item)); |