From cf34337f9886bb45f16f0114dc8f3265aea912ce Mon Sep 17 00:00:00 2001 From: Jon Simons Date: Sat, 14 Sep 2019 21:13:47 -0400 Subject: list-objects-filter: give a more specific error sparse parsing error The sparse:oid filter has two error modes: we might fail to resolve the name to an OID, or we might fail to parse the contents of that OID. In the latter case, let's give a less generic error message, and mention the OID we did find. While we're here, let's also mark both messages as translatable. Signed-off-by: Jeff King Acked-by: Jeff Hostetler Signed-off-by: Junio C Hamano --- list-objects-filter.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'list-objects-filter.c') diff --git a/list-objects-filter.c b/list-objects-filter.c index d2cdc03a73..50f0c6d07b 100644 --- a/list-objects-filter.c +++ b/list-objects-filter.c @@ -469,11 +469,12 @@ static void *filter_sparse_oid__init( if (get_oid_with_context(the_repository, filter_options->sparse_oid_name, GET_OID_BLOB, &sparse_oid, &oc)) - die("unable to access sparse blob in '%s'", + die(_("unable to access sparse blob in '%s'"), filter_options->sparse_oid_name); d->omits = omitted; if (add_excludes_from_blob_to_list(&sparse_oid, NULL, 0, &d->el) < 0) - die("could not load filter specification"); + die(_("unable to parse sparse filter data in %s"), + oid_to_hex(&sparse_oid)); ALLOC_GROW(d->array_frame, d->nr + 1, d->alloc); d->array_frame[d->nr].defval = 0; /* default to include */ -- cgit v1.2.1