Merge branch 'tb/rev-list-unpacked-fix'

[thirdparty/git.git] / list-objects.c

diff --git a/list-objects.c b/list-objects.c
index f4e1104b56fb64c0e9230b284350974a6900f91b..f39b68faf54889144abd81e2c1f9c6f19edd8d4f 100644 (file)
--- 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);
 }