From: Andrew Oakley <andrew@adoakley.name>
To: git@vger.kernel.org, Luke Diamand <luke@diamand.org>,
Jonathan Tan <jonathantanmy@google.com>
Cc: Andrew Oakley <andrew@adoakley.name>
Subject: [PATCH 0/7] Submodules and partial clones
Date: Tue, 29 Sep 2020 16:53:43 +0100 [thread overview]
Message-ID: <20200929155350.49066-1-andrew@adoakley.name> (raw)
I've been investigating what is required to get submodules and partial
clones to work well together. The issue seems to be that the correct
repository is not passed around, so we sometimes end up trying to fetch
objects from the wrong place.
These patches don't make promisor_remote_get_direct handle different
repositories because I've not found a case where that is necessary.
The patches rework various cases where objects from a submodule are
added to the object store of the main repository. There are some
remaining cases where add_to_alternates_memory is used to do this, but
add_submodule_odb has been removed.
I expect there will be some remaining issues, but these changes seem to
be enough to get the basics working.
Andrew Oakley (6):
refs: store owning repository for object lookup
submodule: use separate submodule repositories
refs: use correct repo in refs_peel_ref
merge-recursive: use separate submodule repository
submodule: remove add_submodule_odb
submodule: use partial clone filter
Luke Diamand (1):
Add failing test for partial clones with submodules
builtin/clone.c | 5 ++
builtin/fsck.c | 2 +-
builtin/pack-objects.c | 2 +-
builtin/submodule--helper.c | 21 +++--
git-submodule.sh | 20 ++++-
http-push.c | 2 +-
merge-recursive.c | 73 ++++++++-------
object.c | 7 +-
object.h | 2 +-
refs.c | 37 ++++----
refs.h | 37 +-------
refs/debug.c | 3 +-
refs/files-backend.c | 22 +++--
refs/iterator.c | 11 ++-
refs/packed-backend.c | 15 ++--
refs/packed-backend.h | 3 +-
refs/ref-cache.c | 5 +-
refs/refs-internal.h | 18 +++-
revision.c | 21 ++---
revision.h | 1 -
submodule.c | 135 +++++++++++++---------------
submodule.h | 11 ++-
t/helper/test-example-decorate.c | 6 +-
t/helper/test-reach.c | 2 +-
t/helper/test-ref-store.c | 1 -
t/t0411-partial-clone-submodules.sh | 44 +++++++++
t/t1406-submodule-ref-store.sh | 17 +---
tag.c | 4 +-
tag.h | 2 +-
upload-pack.c | 2 +-
walker.c | 3 +-
31 files changed, 301 insertions(+), 233 deletions(-)
create mode 100755 t/t0411-partial-clone-submodules.sh
--
2.26.2
next reply other threads:[~2020-09-29 16:13 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-29 15:53 Andrew Oakley [this message]
2020-09-29 15:53 ` [PATCH 1/7] refs: store owning repository for object lookup Andrew Oakley
2020-09-29 15:53 ` [PATCH 2/7] submodule: use separate submodule repositories Andrew Oakley
2020-09-29 15:53 ` [PATCH 3/7] Add failing test for partial clones with submodules Andrew Oakley
2020-09-29 15:53 ` [PATCH 4/7] refs: use correct repo in refs_peel_ref Andrew Oakley
2020-09-29 15:53 ` [PATCH 5/7] merge-recursive: use separate submodule repository Andrew Oakley
2020-09-29 15:53 ` [PATCH 6/7] submodule: remove add_submodule_odb Andrew Oakley
2020-09-29 15:53 ` [PATCH 7/7] submodule: use partial clone filter Andrew Oakley
2020-09-29 18:05 ` [PATCH 0/7] Submodules and partial clones Jonathan Tan
2020-09-30 13:28 ` Andrew Oakley
2020-09-30 20:41 ` Jonathan Tan
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200929155350.49066-1-andrew@adoakley.name \
--to=andrew@adoakley.name \
--cc=git@vger.kernel.org \
--cc=jonathantanmy@google.com \
--cc=luke@diamand.org \
/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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.