list-objects-filter: delay parsing of sparse oid

The list-objects-filter code has two steps to its initialization:

  1. parse_list_objects_filter() makes sure the spec is a filter we know
     about and is syntactically correct. This step is done by "rev-list"
     or "upload-pack" that is going to apply a filter, but also by "git
     clone" or "git fetch" before they send the spec across the wire.

  2. list_objects_filter__init() runs the type-specific initialization
     (using function pointers established in step 1). This happens at
     the start of traverse_commit_list_filtered(), when we're about to
     actually use the filter.

It's a good idea to parse as much as we can in step 1, in order to catch
problems early (e.g., a blob size limit that isn't a number). But one
thing we _shouldn't_ do is resolve any oids at that step (e.g., for
sparse-file contents specified by oid). In the case of a fetch, the oid
has to be resolved on the remote side.

The current code does resolve the oid during the parse phase, but
ignores any error (which we must do, because we might just be sending
the spec across the wire). This leads to two bugs:

  - if we're not in a repository (e.g., because it's git-clone parsing
    the spec), then we trigger a BUG() trying to resolve the name

  - if we did hit the error case, we still have to notice that later and
    bail. The code path in rev-list handles this, but the one in
    upload-pack does not, leading to a segfault.

We can fix both by moving the oid resolution into the sparse-oid init
function. At that point we know we have a repository (because we're
about to traverse), and handling the error there fixes the segfault.

As a bonus, we can drop the NULL sparse_oid_value check in rev-list,
since this is now handled in the sparse-oid-filter init function.

Signed-off-by: Jeff King <peff@peff.net>
Acked-by: Jeff Hostetler <jeffhost@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/rev-list.c b/builtin/rev-list.c
index 301ccb970bb36340bc6b4a136a3029811f252aa2..74dbfad73dcb8a081c4e4d432c28897a8ea47551 100644 (file)
--- a/builtin/rev-list.c
+++ b/builtin/rev-list.c
@@ -471,10 +471,6 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
                        parse_list_objects_filter(&filter_options, arg);
                        if (filter_options.choice && !revs.blob_objects)
                                die(_("object filtering requires --objects"));
-                       if (filter_options.choice == LOFC_SPARSE_OID &&
-                           !filter_options.sparse_oid_value)
-                               die(_("invalid sparse value '%s'"),
-                                   filter_options.filter_spec);
                        continue;
                }
                if (!strcmp(arg, ("--no-" CL_ARG__FILTER))) {

diff --git a/list-objects-filter-options.c b/list-objects-filter-options.c
index 1cb20c659c82b151a652da0528d0673ac629cc6c..adbea552a0c1c2f4483049364baab48f5b428b28 100644 (file)
--- a/list-objects-filter-options.c
+++ b/list-objects-filter-options.c
@@ -63,17 +63,7 @@ static int gently_parse_list_objects_filter(
                return 0;
 
        } else if (skip_prefix(arg, "sparse:oid=", &v0)) {
-               struct object_context oc;
-               struct object_id sparse_oid;
-
-               /*
-                * Try to parse <oid-expression> into an OID for the current
-                * command, but DO NOT complain if we don't have the blob or
-                * ref locally.
-                */
-               if (!get_oid_with_context(the_repository, v0, GET_OID_BLOB,
-                                         &sparse_oid, &oc))
-                       filter_options->sparse_oid_value = oiddup(&sparse_oid);
+               filter_options->sparse_oid_name = xstrdup(v0);
                filter_options->choice = LOFC_SPARSE_OID;
                return 0;
 
@@ -138,7 +128,7 @@ void list_objects_filter_release(
        struct list_objects_filter_options *filter_options)
 {
        free(filter_options->filter_spec);
-       free(filter_options->sparse_oid_value);
+       free(filter_options->sparse_oid_name);
        memset(filter_options, 0, sizeof(*filter_options));
 }
 

diff --git a/list-objects-filter-options.h b/list-objects-filter-options.h
index c54f0000fbade5608e81345a9c5dbd54137d352d..20b9d1e587a74da0196d09ad0c8551e0c7280648 100644 (file)
--- a/list-objects-filter-options.h
+++ b/list-objects-filter-options.h
@@ -42,7 +42,7 @@ struct list_objects_filter_options {
         * choice-specific; not all values will be defined for any given
         * choice.
         */
-       struct object_id *sparse_oid_value;
+       char *sparse_oid_name;
        unsigned long blob_limit_value;
        unsigned long tree_exclude_depth;
 };

diff --git a/list-objects-filter.c b/list-objects-filter.c
index 36e1f774bcfc50d0475ad835464cec092314eb79..d2cdc03a73d93c2c24da0aa690c575cbcf6152bd 100644 (file)
--- a/list-objects-filter.c
+++ b/list-objects-filter.c
@@ -463,9 +463,16 @@ static void *filter_sparse_oid__init(
        filter_free_fn *filter_free_fn)
 {
        struct filter_sparse_data *d = xcalloc(1, sizeof(*d));
+       struct object_context oc;
+       struct object_id sparse_oid;
+
+       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'",
+                   filter_options->sparse_oid_name);
        d->omits = omitted;
-       if (add_excludes_from_blob_to_list(filter_options->sparse_oid_value,
-                                          NULL, 0, &d->el) < 0)
+       if (add_excludes_from_blob_to_list(&sparse_oid, NULL, 0, &d->el) < 0)
                die("could not load filter specification");
 
        ALLOC_GROW(d->array_frame, d->nr + 1, d->alloc);

diff --git a/t/t5616-partial-clone.sh b/t/t5616-partial-clone.sh
index 0bdbc819f1d680d368b87d000aba24fe033927b2..84365b802a8ea7cfa710140fb692136ddc78c1c2 100755 (executable)
--- a/t/t5616-partial-clone.sh
+++ b/t/t5616-partial-clone.sh
@@ -252,7 +252,7 @@ test_expect_success 'setup src repo for sparse filter' '
        git -C sparse-src commit -m "add sparse checkout files"
 '
 
-test_expect_failure 'partial clone with sparse filter succeeds' '
+test_expect_success 'partial clone with sparse filter succeeds' '
        rm -rf dst.git &&
        git clone --no-local --bare \
                  --filter=sparse:oid=master:only-one \
@@ -265,7 +265,7 @@ test_expect_failure 'partial clone with sparse filter succeeds' '
        )
 '
 
-test_expect_failure 'partial clone with unresolvable sparse filter fails cleanly' '
+test_expect_success 'partial clone with unresolvable sparse filter fails cleanly' '
        rm -rf dst.git &&
        test_must_fail git clone --no-local --bare \
                                 --filter=sparse:oid=master:no-such-name \