From: Jon Simons <jon@jonsimons.org>
To: jon@jonsimons.org, git@vger.kernel.org
Cc: me@ttaylorr.com, peff@peff.net, sunshine@sunshineco.com,
stolee@gmail.com
Subject: [PATCH v3 1/2] list-objects-filter: only parse sparse OID when 'have_git_dir'
Date: Thu, 29 Aug 2019 19:19:24 -0400 [thread overview]
Message-ID: <20190829231925.15223-2-jon@jonsimons.org> (raw)
In-Reply-To: <20190829231925.15223-1-jon@jonsimons.org>
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(-)
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..5c68431d10 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 &&
+ echo "/*" >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
--
2.23.0.37.g745f681289.dirty
next prev parent reply other threads:[~2019-08-29 23:19 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-29 23:19 [PATCH v3 0/2] partial-clone: fix two issues with sparse filter handling Jon Simons
2019-08-29 23:19 ` Jon Simons [this message]
2019-08-30 18:08 ` [PATCH v3 1/2] list-objects-filter: only parse sparse OID when 'have_git_dir' Junio C Hamano
2019-09-04 4:54 ` Jeff King
2019-09-05 18:57 ` Junio C Hamano
2019-09-09 13:54 ` Jeff Hostetler
2019-09-09 17:08 ` Jeff King
2019-09-09 20:03 ` Jeff Hostetler
2019-09-15 1:09 ` [PATCH 0/3] clone --filter=sparse:oid bugs Jeff King
2019-09-15 1:11 ` [PATCH 1/3] t5616: test cloning/fetching with sparse:oid=<oid> filter Jeff King
2019-09-15 1:13 ` [PATCH 2/3] list-objects-filter: delay parsing of sparse oid Jeff King
2019-09-15 16:12 ` Jeff King
2019-09-17 19:22 ` Junio C Hamano
2019-09-15 1:13 ` [PATCH 3/3] list-objects-filter: give a more specific error sparse parsing error Jeff King
2019-09-15 16:51 ` [PATCH 4/3] list-objects-filter: use empty string instead of NULL for sparse "base" Jeff King
2019-09-16 14:31 ` [PATCH 0/3] clone --filter=sparse:oid bugs Jeff Hostetler
2019-09-09 17:12 ` [PATCH v3 1/2] list-objects-filter: only parse sparse OID when 'have_git_dir' Junio C Hamano
2019-09-09 19:49 ` Jeff Hostetler
2019-08-29 23:19 ` [PATCH v3 2/2] list-objects-filter: handle unresolved sparse filter OID Jon Simons
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190829231925.15223-2-jon@jonsimons.org \
--to=jon@jonsimons.org \
--cc=git@vger.kernel.org \
--cc=me@ttaylorr.com \
--cc=peff@peff.net \
--cc=stolee@gmail.com \
--cc=sunshine@sunshineco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).