| Message ID | 20190829223811.12072-2-jon@jonsimons.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | partial-clone: fix two issues with sparse filter handling | expand |
On 8/29/19 3:45 PM, Eric Sunshine wrote: > On Thu, Aug 29, 2019 at 6:38 PM Jon Simons <jon@jonsimons.org> 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. >> [...] >> Signed-off-by: Jon Simons <jon@jonsimons.org> >> --- >> diff --git a/t/t5616-partial-clone.sh b/t/t5616-partial-clone.sh >> @@ -241,6 +241,27 @@ test_expect_success 'fetch what is specified on CLI even if already promised' ' >> +test_expect_success 'setup src repo for sparse filter' ' >> + git init sparse-src && >> + git -C sparse-src config --local uploadpack.allowfilter 1 && >> + git -C sparse-src config --local uploadpack.allowanysha1inwant 1 && >> + for n in 1 2 3 4 >> + do >> + test_commit -C sparse-src "this-is-file-$n" file.$n.txt || return 1 >> + done && >> + test_write_lines /file1.txt /file3.txt >sparse-src/odd-files && >> + test_write_lines /file2.txt /file4.txt >sparse-src/even-files && >> + test_write_lines /* >sparse-src/all-files && > > Hmm, does this work correctly? I would expect the /* to expand to all > names at the root of your filesystem, which isn't what you want. You > want the literal string "/*", which means you should quote it (with > double quotes inside the test body). I'd also suggest using the simple > 'echo' for this one as you did in v1 since it's more obvious that > you're writing just a single line to the file, whereas using > test_write_lines() has the potential to confuses readers. Oof, thanks -- yes, this is incorrect. I will revert this back to 'echo'. I misapplied your initial suggesttion to all three lines. -Jon
On Thu, Aug 29, 2019 at 7:12 PM Jon Simons <jon@jonsimons.org> wrote: > On 8/29/19 3:45 PM, Eric Sunshine wrote: > > On Thu, Aug 29, 2019 at 6:38 PM Jon Simons <jon@jonsimons.org> wrote: > >> + test_write_lines /* >sparse-src/all-files && > > > > Hmm, does this work correctly? I would expect the /* to expand to all > > names at the root of your filesystem, which isn't what you want. You > > want the literal string "/*", which means you should quote it (with > > double quotes inside the test body). [...] > > Oof, thanks -- yes, this is incorrect. I will revert this back to > 'echo'. I misapplied your initial suggesttion to all three lines. Curious. Did the test still pass even with the unquoted "/*"? If so, does that indicate a flaw in the test or somewhere else?
On 8/29/19 4:48 PM, Eric Sunshine wrote: > On Thu, Aug 29, 2019 at 7:12 PM Jon Simons <jon@jonsimons.org> wrote: >> On 8/29/19 3:45 PM, Eric Sunshine wrote: >>> On Thu, Aug 29, 2019 at 6:38 PM Jon Simons <jon@jonsimons.org> wrote: >>>> + test_write_lines /* >sparse-src/all-files && >>> >>> Hmm, does this work correctly? I would expect the /* to expand to all >>> names at the root of your filesystem, which isn't what you want. You >>> want the literal string "/*", which means you should quote it (with >>> double quotes inside the test body). [...] >> >> Oof, thanks -- yes, this is incorrect. I will revert this back to >> 'echo'. I misapplied your initial suggesttion to all three lines. > > Curious. Did the test still pass even with the unquoted "/*"? If so, > does that indicate a flaw in the test or somewhere else? Yes, the test also passes with the unquoted "/*". I think this showcases that the test really is a bare minimal sanity check that clones providing a sparse filter argument are able to run to completion. As-is the test does not further assert any behavior of the filter, just that the BUG is avoided. -Jon
diff --git a/list-objects-filter-options.c b/list-objects-filter-options.c index 1cb20c659c..aaba312edb 100644 --- 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)) filter_options->sparse_oid_value = oiddup(&sparse_oid); filter_options->choice = LOFC_SPARSE_OID; diff --git a/t/t5616-partial-clone.sh b/t/t5616-partial-clone.sh index 565254558f..0c6f365bf2 100755 --- a/t/t5616-partial-clone.sh +++ b/t/t5616-partial-clone.sh @@ -241,6 +241,27 @@ test_expect_success 'fetch what is specified on CLI even if already promised' ' ! grep "?$(cat blob)" missing_after ' +test_expect_success 'setup src repo for sparse filter' ' + git init sparse-src && + git -C sparse-src config --local uploadpack.allowfilter 1 && + git -C sparse-src config --local uploadpack.allowanysha1inwant 1 && + for n in 1 2 3 4 + do + test_commit -C sparse-src "this-is-file-$n" file.$n.txt || return 1 + done && + test_write_lines /file1.txt /file3.txt >sparse-src/odd-files && + test_write_lines /file2.txt /file4.txt >sparse-src/even-files && + test_write_lines /* >sparse-src/all-files && + git -C sparse-src add odd-files even-files all-files && + git -C sparse-src commit -m "some sparse checkout files" +' + +test_expect_success 'partial clone with sparse filter succeeds' ' + git clone --no-local --no-checkout --filter=sparse:oid=master:all-files sparse-src pc-all && + git clone --no-local --no-checkout --filter=sparse:oid=master:even-files sparse-src pc-even && + git clone --no-local --no-checkout --filter=sparse:oid=master:odd-files sparse-src pc-odd +' + . "$TEST_DIRECTORY"/lib-httpd.sh start_httpd
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. t5616 is updated to demonstrate the change. Signed-off-by: Jon Simons <jon@jonsimons.org> --- list-objects-filter-options.c | 3 ++- t/t5616-partial-clone.sh | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-)