From: Jeff King <peff@peff.net>
To: Emily Shaffer <emilyshaffer@google.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] clone: teach --single-branch and --branch during --recurse
Date: Mon, 27 Jan 2020 18:00:39 -0500 [thread overview]
Message-ID: <20200127230039.GA19360@coredump.intra.peff.net> (raw)
In-Reply-To: <20200127222019.GA233139@google.com>
On Mon, Jan 27, 2020 at 02:20:19PM -0800, Emily Shaffer wrote:
> > It would make more sense to me to either (or both):
> >
> > - make sure that .gitmodules has enough information about which branch
> > to use for each submodule
>
> Hum. I don't work with them day to day, but aren't we already in that
> state? Is that not what the 'branch' option for each submodule means?
Probably? :) I've never used the feature myself, but it does seem like
the right thing (and should definitely take precedence over any "-b"
option passed to the superproject).
> > - offer an extra option for the default branch to use for any
> > submodules. This is still not general enough to cover all situations
> > (e.g., the bar/baz you showed above), but it at least makes it
> > relatively easy to cover the simple cases, without breaking any
> > existing ones.
>
> Yeah, this is sort of the direction my mind went too - "not
> --branch recursively, but --submodule-branch". But that breaks down when you've
> got a nontrivial number of submodules, at which point you're gonna have
> a hard time unless you've got the .gitmodules configured correctly.
Right. Probably the right answer for that bar/baz case is to complain to
the superproject owner that they didn't put branch fields into their
.gitmodules. So...
> Well, as for this patch, let me try it with just --single-branch and see
> whether that works for the case the user reported. I can head back to
> the drawing board if not.
Yeah, that makes perfect sense to me.
-Peff
next prev parent reply other threads:[~2020-01-27 23:00 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-08 23:19 [PATCH] clone: teach --single-branch and --branch during --recurse Emily Shaffer
2020-01-08 23:39 ` Emily Shaffer
2020-01-09 8:11 ` Jeff King
2020-01-16 22:38 ` Emily Shaffer
2020-01-17 21:03 ` Jeff King
2020-01-27 22:20 ` Emily Shaffer
2020-01-27 22:49 ` Emily Shaffer
2020-01-27 23:10 ` Jeff King
2020-01-28 1:08 ` Emily Shaffer
2020-01-28 1:31 ` Jeff King
2020-01-28 2:10 ` Emily Shaffer
2020-01-27 23:00 ` Jeff King [this message]
2020-01-28 22:17 ` [PATCH v2] clone: pass --single-branch during --recurse-submodules Emily Shaffer
2020-01-30 10:23 ` Jeff King
2020-02-21 2:53 ` Emily Shaffer
2020-02-21 3:16 ` Jeff King
2020-02-21 3:10 ` [PATCH v3 0/2] propagate --single-branch during clone --recurse-submodules Emily Shaffer
2020-02-21 3:10 ` [PATCH v3 1/2] submodule--helper: use C99 named initializer Emily Shaffer
2020-02-21 5:26 ` Jeff King
2020-02-22 20:13 ` Junio C Hamano
2020-02-21 3:10 ` [PATCH v3 2/2] clone: pass --single-branch during --recurse-submodules Emily Shaffer
2020-02-21 5:28 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200127230039.GA19360@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=emilyshaffer@google.com \
--cc=git@vger.kernel.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.