builtin/cat-file: support "object:type=" objects filter
Implement support for the "object:type=" filter in git-cat-file(1), which causes us to omit all objects that don't match the provided object type. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
committed by
Junio C Hamano
parent
dbe1b32d59
commit
8fa9fe171a
@@ -484,7 +484,8 @@ static void batch_object_write(const char *obj_name,
|
||||
|
||||
if (use_mailmap ||
|
||||
opt->objects_filter.choice == LOFC_BLOB_NONE ||
|
||||
opt->objects_filter.choice == LOFC_BLOB_LIMIT)
|
||||
opt->objects_filter.choice == LOFC_BLOB_LIMIT ||
|
||||
opt->objects_filter.choice == LOFC_OBJECT_TYPE)
|
||||
data->info.typep = &data->type;
|
||||
if (opt->objects_filter.choice == LOFC_BLOB_LIMIT)
|
||||
data->info.sizep = &data->size;
|
||||
@@ -521,6 +522,14 @@ static void batch_object_write(const char *obj_name,
|
||||
return;
|
||||
}
|
||||
break;
|
||||
case LOFC_OBJECT_TYPE:
|
||||
if (data->type != opt->objects_filter.object_type) {
|
||||
if (!opt->all_objects)
|
||||
report_object_status(opt, obj_name,
|
||||
&data->oid, "excluded");
|
||||
return;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
BUG("unsupported objects filter");
|
||||
}
|
||||
@@ -1062,6 +1071,7 @@ int cmd_cat_file(int argc,
|
||||
break;
|
||||
case LOFC_BLOB_NONE:
|
||||
case LOFC_BLOB_LIMIT:
|
||||
case LOFC_OBJECT_TYPE:
|
||||
if (!batch.enabled)
|
||||
usage(_("objects filter only supported in batch mode"));
|
||||
break;
|
||||
|
||||
Reference in New Issue
Block a user