diff options
author | Junio C Hamano <gitster@pobox.com> | 2025-01-17 01:35:14 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2025-01-17 01:35:14 +0100 |
commit | 564b907c8a39ac6e6f8aecc6b2a1c125d41ada66 (patch) | |
tree | a491394905500adf1c0b34fae881a8fb08033628 /shallow.h | |
parent | Merge branch 'ps/object-collision-check' (diff) | |
parent | sign-compare: avoid comparing ptrdiff with an int/unsigned (diff) | |
download | git-564b907c8a39ac6e6f8aecc6b2a1c125d41ada66.tar.xz git-564b907c8a39ac6e6f8aecc6b2a1c125d41ada66.zip |
Merge branch 'ps/more-sign-compare'
More -Wsign-compare fixes.
* ps/more-sign-compare:
sign-compare: avoid comparing ptrdiff with an int/unsigned
commit-reach: use `size_t` to track indices when computing merge bases
shallow: fix -Wsign-compare warnings
builtin/log: fix remaining -Wsign-compare warnings
builtin/log: use `size_t` to track indices
commit-reach: use `size_t` to track indices in `get_reachable_subset()`
commit-reach: use `size_t` to track indices in `remove_redundant()`
commit-reach: fix type of `min_commit_date`
commit-reach: fix index used to loop through unsigned integer
prio-queue: fix type of `insertion_ctr`
Diffstat (limited to 'shallow.h')
-rw-r--r-- | shallow.h | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -59,8 +59,8 @@ void prune_shallow(unsigned options); */ struct shallow_info { struct oid_array *shallow; - int *ours, nr_ours; - int *theirs, nr_theirs; + size_t *ours, nr_ours; + size_t *theirs, nr_theirs; struct oid_array *ref; /* for receive-pack */ @@ -69,7 +69,7 @@ struct shallow_info { int *reachable; int *shallow_ref; struct commit **commits; - int nr_commits; + size_t nr_commits; }; void prepare_shallow_info(struct shallow_info *, struct oid_array *); |