From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: Konstantin Ryabitsev <konstantin@linuxfoundation.org>
Cc: Derrick Stolee <stolee@gmail.com>,
Lars Schneider <larsxschneider@gmail.com>,
git <git@vger.kernel.org>, Jeff King <peff@peff.net>,
Duy Nguyen <pclouds@gmail.com>
Subject: Re: worktrees vs. alternates
Date: Wed, 16 May 2018 19:54:40 +0200 [thread overview]
Message-ID: <87in7nbi5b.fsf@evledraar.gmail.com> (raw)
In-Reply-To: <20180516154935.GA9712@chatter>
On Wed, May 16 2018, Konstantin Ryabitsev wrote:
> On Wed, May 16, 2018 at 05:34:34PM +0200, Ævar Arnfjörð Bjarmason wrote:
>>I may have missed some edge case, but I believe this entire workaround
>>isn't needed if you guarantee that the parent repo doesn't contain any
>>objects that will get un-referenced.
>
> You can't guarantee that, because the parent repo can have its history
> rewritten either via a forced push, or via a rebase. Obviously, this
> won't happen in something like torvalds/linux.git, which is why it's
> pretty safe to alternate off of that repo for us, but codeaurora.org
> repos aren't always strictly-ff (e.g. because they may rebase themselves
> based on what is in upstream AOSP repos) -- so objects in them may
> become unreferenced and pruned away, corrupting any repos using them for
> alternates.
Right, it wouldn't work in the general case. I was thinking of the
use-case for doing this (say with known big monorepos) where you know a
given branch won't be unwound.
Still, there's a tiny variation on this that should work with arbitrary
repos whose master may be rewound, you just setup a refspec to fetch
their upstream HEAD into master-1 without having "+" in the
refspec. Then if they never rewind you keep fetching to master-1
forever.
If they do rewind you fetch that to master-2 and so forth, so you can
follow an upstream rewinding branch while still guaranteeing that no
objects ever disappear from your parent repo. This is still a lot
simpler than the juggling approach you noted, since it's just a tiny
shellscript around the "fetch".
This assumes that:
1. Whenever this happens the history is still similar enough that the
parent won't balloon in size like this, or at least it won't be
worse than not using alternates at all.
2. You're getting most of the gains of the object sharing by just
grabbing the upstream HEAD branch, i.e. you don't have some repo
with huge and N unrelated histories.
next prev parent reply other threads:[~2018-05-16 17:54 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-16 8:13 worktrees vs. alternates Lars Schneider
2018-05-16 9:29 ` Ævar Arnfjörð Bjarmason
2018-05-16 9:42 ` Robert P. J. Day
2018-05-16 11:07 ` Ævar Arnfjörð Bjarmason
2018-05-16 9:51 ` Lars Schneider
2018-05-16 10:33 ` Ævar Arnfjörð Bjarmason
2018-05-16 13:02 ` Derrick Stolee
2018-05-16 14:58 ` Konstantin Ryabitsev
2018-05-16 15:34 ` Ævar Arnfjörð Bjarmason
2018-05-16 15:49 ` Konstantin Ryabitsev
2018-05-16 17:54 ` Ævar Arnfjörð Bjarmason [this message]
2018-05-16 17:14 ` Martin Fick
2018-05-16 17:41 ` Konstantin Ryabitsev
2018-05-16 18:02 ` Ævar Arnfjörð Bjarmason
2018-05-16 18:12 ` Konstantin Ryabitsev
2018-05-16 18:26 ` Martin Fick
2018-05-16 19:01 ` Konstantin Ryabitsev
2018-05-16 19:03 ` Martin Fick
2018-05-16 19:11 ` Konstantin Ryabitsev
2018-05-16 19:18 ` Martin Fick
2018-05-16 19:23 ` Jeff King
2018-05-16 19:29 ` Konstantin Ryabitsev
2018-05-16 19:37 ` Jeff King
2018-05-16 19:40 ` Martin Fick
2018-05-16 20:06 ` Jeff King
2018-05-16 20:43 ` Martin Fick
2018-05-16 20:02 ` Konstantin Ryabitsev
2018-05-16 20:17 ` Jeff King
2018-05-17 0:43 ` Sitaram Chamarty
2018-05-17 3:31 ` Jeff King
2018-05-19 5:45 ` Duy Nguyen
2018-05-16 19:14 ` Jeff King
2018-05-16 21:18 ` Stefan Beller
2018-05-16 23:45 ` Jeff King
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=87in7nbi5b.fsf@evledraar.gmail.com \
--to=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=konstantin@linuxfoundation.org \
--cc=larsxschneider@gmail.com \
--cc=pclouds@gmail.com \
--cc=peff@peff.net \
--cc=stolee@gmail.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).