diff options
author | Matthew DeVore <matvore@google.com> | 2018-10-06 00:31:24 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-10-07 02:55:00 +0300 |
commit | 99c9aa9579ae970c0d273ced8fb8efe9eed70a75 (patch) | |
tree | fc260385a350e48790bd19a575075244b7795c4d /revision.c | |
parent | 7c0fe330d5f3d2fc7aac57a19c7580ea2543c799 (diff) |
revision: mark non-user-given objects instead
Currently, list-objects.c incorrectly treats all root trees of commits
as USER_GIVEN. Also, it would be easier to mark objects that are
non-user-given instead of user-given, since the places in the code
where we access an object through a reference are more obvious than
the places where we access an object that was given by the user.
Resolve these two problems by introducing a flag NOT_USER_GIVEN that
marks blobs and trees that are non-user-given, replacing USER_GIVEN.
(Only blobs and trees are marked because this mark is only used when
filtering objects, and filtering of other types of objects is not
supported yet.)
This fixes a bug in that git rev-list behaved differently from git
pack-objects. pack-objects would *not* filter objects given explicitly
on the command line and rev-list would filter. This was because the two
commands used a different function to add objects to the rev_info
struct. This seems to have been an oversight, and pack-objects has the
correct behavior, so I added a test to make sure that rev-list now
behaves properly.
Signed-off-by: Matthew DeVore <matvore@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'revision.c')
-rw-r--r-- | revision.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/revision.c b/revision.c index 0627494378..6d355b43c3 100644 --- a/revision.c +++ b/revision.c @@ -175,7 +175,6 @@ static void add_pending_object_with_path(struct rev_info *revs, strbuf_release(&buf); return; /* do not add the commit itself */ } - obj->flags |= USER_GIVEN; add_object_array_with_path(obj, name, &revs->pending, mode, path); } |