git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Jacob Keller <jacob.keller@gmail.com>
To: Hedges Alexander <ahedges@student.ethz.ch>
Cc: "git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: Feature Request: Branch-Aware Submodules
Date: Sun, 28 Aug 2016 19:17:45 -0700	[thread overview]
Message-ID: <CA+P7+xqA_3a8EPZ=2Y5pgkL+N=_F1v5pfyzErwest9aoKZC37w@mail.gmail.com> (raw)
In-Reply-To: <51671371-C59A-4304-99B2-B2C2256C4001@student.ethz.ch>

On Fri, Aug 26, 2016 at 8:12 AM, Hedges  Alexander
<ahedges@student.ethz.ch> wrote:
>> On 25 Aug 2016, at 19:45, Stefan Beller <sbeller@google.com> wrote:
>> [1] https://github.com/jlehmann/git-submod-enhancements
>> which has some attempts for checkout including the submodules.
>> I also tried writing some patches which integrate checking out submodules
>> via checkout as well. A quicker `solution` would be a config option that
>> just runs `git submodule update` after each checkout/pull etc.
>>
>
> I see. The quick fix is almost what I’m looking for, except that it leaves
> the repo in a detached head state. Could the submodule update be made
> automatically and intelligently pick the branch?
>

You probably want "git submodule update --rebase" or "git submodule
update --merge" See git help submodule under the update section, or
even a custom command variant where you can write your own bit of
shell that does what your project expects.

Thanks,
Jake

  reply	other threads:[~2016-08-29  2:18 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <5EA7D232-5D41-4653-9E35-21C502C79C92@student.ethz.ch>
2016-08-26 15:12 ` Feature Request: Branch-Aware Submodules Hedges  Alexander
2016-08-29  2:17   ` Jacob Keller [this message]
2016-09-01 11:34     ` Hedges  Alexander
2016-08-25  9:00 Hedges  Alexander
2016-08-25 17:45 ` Stefan Beller
2016-08-25 20:50   ` Junio C Hamano
2016-08-25 20:55     ` Stefan Beller
2016-08-25 21:25       ` Junio C Hamano
2016-08-25 17:46 ` Junio C Hamano

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='CA+P7+xqA_3a8EPZ=2Y5pgkL+N=_F1v5pfyzErwest9aoKZC37w@mail.gmail.com' \
    --to=jacob.keller@gmail.com \
    --cc=ahedges@student.ethz.ch \
    --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.
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).