From: Alex Riesen <raa.lkml@gmail.com>
Date: Sun, 31 May 2009 13:39:28 GMT
Subject: Re: Managing submodules on large multi-user projects
Message-ID: <81b0412b0905310639i12440ae4i9331d57a752a6b96@mail.gmail.com>
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).