git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Alex Riesen <raa.lkml@gmail.com>
To: "R. Tyler Ballance" <tyler@slide.com>
Cc: git@vger.kernel.org
Subject: Re: Managing submodules on large multi-user projects
Date: Sun, 31 May 2009 15:39:28 +0200	[thread overview]
Message-ID: <81b0412b0905310639i12440ae4i9331d57a752a6b96@mail.gmail.com> (raw)
In-Reply-To: <20090529184125.GE11222@starfruit.corp.slide.com>

2009/5/29 R. Tyler Ballance <tyler@slide.com>:
> Other developers with other branches will then periodically merge master
> into their project/topic branches but will either neglect to run
> `git submodule update` or our bootstrap script (which also executes the
> submodule update command). At this point they'll have outstanding
> changes of their own, and the submodule will be marked as "modified" as
> well. Usually what will then happen is they'll `git commit -a` without
> thinking and the submodule's reference will be changed (typically from
> B->A, undoing the previous change).

This (the fact that "git commit -a" updates submodules in the index after merge)
is probably our bug (or at least an unfinished feature).

      parent reply	other threads:[~2009-05-31 13:41 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-05-29 18:41 Managing submodules on large multi-user projects R. Tyler Ballance
2009-05-29 19:53 ` Avery Pennarun
2009-05-29 20:09   ` R. Tyler Ballance
2009-05-29 20:18     ` Avery Pennarun
2009-05-29 22:58 ` Felipe Contreras
2009-06-23 22:58   ` R. Tyler Ballance
2009-05-31 13:39 ` Alex Riesen [this message]

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=81b0412b0905310639i12440ae4i9331d57a752a6b96@mail.gmail.com \
    --to=raa.lkml@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=tyler@slide.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).