revision: mark commit parents as NOT_USER_GIVEN

The NOT_USER_GIVEN flag of an object marks whether a flag was explicitly provided by the user or not. The most important use case for this is when filtering objects: only objects that were not explicitly requested will get filtered. The flag is currently only set for blobs and trees, which has been fine given that there are no filters for tags or commits currently. We're about to extend filtering capabilities to add object type filter though, which requires us to set up the NOT_USER_GIVEN flag correctly -- if it's not set, the object wouldn't get filtered at all. Mark unseen commit parents as NOT_USER_GIVEN when processing parents. Like this, explicitly provided parents stay user-given and thus unfiltered, while parents which get loaded as part of the graph walk can be filtered. This commit shouldn't have any user-visible impact yet as there is no logic to filter commits yet. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Patrick Steinhardt committed Apr 9, 2021 at 13:27 UTC b2025da38be94568bf046c2b8520fe87bcbb5c3d
2 files changed +2 -5
revision.c
+2 -2
@@ -1123,7 +1123,7 @@ static int process_parents(struct rev_info *revs, struct commit *commit,
1123 mark_parents_uninteresting(p);
1124 if (p->object.flags & SEEN)
1125 continue;
1126 - p->object.flags |= SEEN;
1126 + p->object.flags |= (SEEN | NOT_USER_GIVEN);
1127 if (list)
1128 commit_list_insert_by_date(p, list);
1129 if (queue)
@@ -1165,7 +1165,7 @@ static int process_parents(struct rev_info *revs, struct commit *commit,
1165 }
1166 p->object.flags |= left_flag;
1167 if (!(p->object.flags & SEEN)) {
1168 - p->object.flags |= SEEN;
1168 + p->object.flags |= (SEEN | NOT_USER_GIVEN);
1169 if (list)
1170 commit_list_insert_by_date(p, list);
1171 if (queue)
revision.h
-3
@@ -44,9 +44,6 @@
44 /*
45 * Indicates object was reached by traversal. i.e. not given by user on
46 * command-line or stdin.
47 - * NEEDSWORK: NOT_USER_GIVEN doesn't apply to commits because we only support
48 - * filtering trees and blobs, but it may be useful to support filtering commits
49 - * in the future.
47 */
48 #define NOT_USER_GIVEN (1u<<25)
49 #define TRACK_LINEAR (1u<<26)