From: Taylor Blau Date: Wed, 7 Jun 2023 22:58:12 +0000 (-0400) Subject: reachable.c: extract `obj_is_recent()` X-Git-Tag: v2.42.0-rc0~90^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=01e9ca4a40e04cceeed01da05bed182556daa005;p=thirdparty%2Fgit.git reachable.c: extract `obj_is_recent()` When enumerating objects in order to add recent ones (i.e. those whose mtime is strictly newer than the cutoff) as tips of a reachability traversal, `add_recent_object()` discards objects which do not meet the recency criteria. The subsequent commit will make checking whether or not an object is recent also consult the list of hooks in `pack.recentHook`. Isolate this check in its own function to keep the additional complexity outside of `add_recent_object()`. Signed-off-by: Taylor Blau Signed-off-by: Junio C Hamano --- diff --git a/reachable.c b/reachable.c index 55bb114353..7a42da5d39 100644 --- a/reachable.c +++ b/reachable.c @@ -69,6 +69,12 @@ struct recent_data { int ignore_in_core_kept_packs; }; +static int obj_is_recent(const struct object_id *oid, timestamp_t mtime, + struct recent_data *data) +{ + return mtime > data->timestamp; +} + static void add_recent_object(const struct object_id *oid, struct packed_git *pack, off_t offset, @@ -78,7 +84,7 @@ static void add_recent_object(const struct object_id *oid, struct object *obj; enum object_type type; - if (mtime <= data->timestamp) + if (!obj_is_recent(oid, mtime, data)) return; /*