Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2023-11-08 09:04:42 +0300
committerJunio C Hamano <gitster@pobox.com>2023-11-08 09:04:42 +0300
commit8ed4eb753881cf3a695cbe531c22698ca222ff0f (patch)
tree28e7f24a60f6b4a854026b8fd1bfeb9387b2e250 /list-objects.c
parentc732f7430da8d4dedccd05540eae3dc7421dcdc6 (diff)
parent7b3c8e9f388c8ef56f17d2cb633c0a579730a563 (diff)
Merge branch 'tb/rev-list-unpacked-fix'
"git rev-list --unpacked --objects" failed to exclude packed non-commit objects, which has been corrected. * tb/rev-list-unpacked-fix: pack-bitmap: drop --unpacked non-commit objects from results list-objects: drop --unpacked non-commit objects from results
Diffstat (limited to 'list-objects.c')
-rw-r--r--list-objects.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/list-objects.c b/list-objects.c
index f4e1104b56..f39b68faf5 100644
--- a/list-objects.c
+++ b/list-objects.c
@@ -39,6 +39,9 @@ static void show_object(struct traversal_context *ctx,
{
if (!ctx->show_object)
return;
+ if (ctx->revs->unpacked && has_object_pack(&object->oid))
+ return;
+
ctx->show_object(object, name, ctx->show_data);
}