On Wed, Aug 28, 2019 at 04:18:23PM -0400, Jon Simons wrote: > Fix a bug in partial cloning with sparse filters by ensuring to check > for 'have_git_dir' before attempting to resolve the sparse filter OID. > > Otherwise the client will trigger: > > BUG: refs.c:1851: attempting to get main_ref_store outside of repository > > when attempting to git clone with a sparse filter. > > Note that this fix is the minimal one which avoids the BUG and allows > for the clone to complete successfully: > > There is an open question as to whether there should be any attempt > to resolve the OID provided by the client in this context, as a filter > for the clone to be used on the remote side. For cases where local > and remote OID resolutions differ, resolving on the client side could > be considered a bug. For now, the minimal approach here is used to > unblock further testing for partial clones with sparse filters, while > a more invasive fix could make sense to pursue as a future direction. Just to provide a little more of our findings to the list: I think the main thing going on here is that the filter options-parsing code is shared on the client and server side (and doesn't have any idea which it is). That's why we see the "do not complain" comment in the context below: > --- a/list-objects-filter-options.c > +++ b/list-objects-filter-options.c > @@ -71,7 +71,8 @@ static int gently_parse_list_objects_filter( > * 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, > + if (have_git_dir() && > + !get_oid_with_context(the_repository, v0, GET_OID_BLOB, > &sparse_oid, &oc)) and why it's OK to just quietly ignore this case. I don't think it's hurting anything in practice. Whether we resolve the name or not, we send the _original_ name to the other side (it would be a bug for us to resolve it ourselves and send the oid). > +test_expect_success 'partial clone with sparse filter succeeds' ' > + git clone --no-local --no-checkout --filter=sparse:oid=master:all-files "file://$(pwd)/sparse-src" pc-all && > + git clone --no-local --no-checkout --filter=sparse:oid=master:even-files "file://$(pwd)/sparse-src" pc-even && > + git clone --no-local --no-checkout --filter=sparse:oid=master:odd-files "file://$(pwd)/sparse-src" pc-odd > +' Since you're using "--no-local", you should be able to just say "sparse-src" without the full path or file URL. I think Eric's style suggestions elsewhere in the thread were sensible, too. And of course the code change itself looks good. -Peff
