Skip to content

Commit 04aeeea

Browse files
pks-tgitster
authored andcommitted
commit-reach: fix type of min_commit_date
The `can_all_from_reach_with_flag()` function accepts a parameter that allows callers to cut off traversal at a specified commit date. This parameter is of type `time_t`, which is a signed type, while we end up comparing it to a commit's `date` field, which is of the unsigned type `timestamp_t`. Fix the parameter to be of type `timestamp_t`. There is only a single caller in "upload-pack.c" that sets this parameter, and that caller knows to pass in a `timestamp_t` already. Signed-off-by: Patrick Steinhardt <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 95c09e4 commit 04aeeea

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

commit-reach.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -780,7 +780,7 @@ int commit_contains(struct ref_filter *filter, struct commit *commit,
780780
int can_all_from_reach_with_flag(struct object_array *from,
781781
unsigned int with_flag,
782782
unsigned int assign_flag,
783-
time_t min_commit_date,
783+
timestamp_t min_commit_date,
784784
timestamp_t min_generation)
785785
{
786786
struct commit **list = NULL;
@@ -883,9 +883,9 @@ int can_all_from_reach(struct commit_list *from, struct commit_list *to,
883883
int cutoff_by_min_date)
884884
{
885885
struct object_array from_objs = OBJECT_ARRAY_INIT;
886-
time_t min_commit_date = cutoff_by_min_date ? from->item->date : 0;
887886
struct commit_list *from_iter = from, *to_iter = to;
888887
int result;
888+
timestamp_t min_commit_date = cutoff_by_min_date ? from->item->date : 0;
889889
timestamp_t min_generation = GENERATION_NUMBER_INFINITY;
890890

891891
while (from_iter) {

commit-reach.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ int commit_contains(struct ref_filter *filter, struct commit *commit,
8181
int can_all_from_reach_with_flag(struct object_array *from,
8282
unsigned int with_flag,
8383
unsigned int assign_flag,
84-
time_t min_commit_date,
84+
timestamp_t min_commit_date,
8585
timestamp_t min_generation);
8686
int can_all_from_reach(struct commit_list *from, struct commit_list *to,
8787
int commit_date_cutoff);

0 commit comments

Comments
 (0)