Re: git submodules and commit
- From
Petr Baudis <pasky@suse.cz>
- Date
- Jul 16, 2008, 12:11 UTC
- Message-ID
- <20080716121124.GM32184@machine.or.cz>
- In-Reply-To
- <487DDCFC.9020007@viscovery.net>
On Wed, Jul 16, 2008 at 01:35:24PM +0200, Johannes Sixt wrote:
Show 18 quoted lines
> Ah, is this your actual scenario? Just to make sure we are talking about > the same thing: > > - You own superproject P. > - $Maintainer owns submodule S. > - You use S in P. > - You make changes to S that you would like $Maintainer to include in the > next release. > x You use in P your changes to S while $Maintainer has not yet released a > new version of S with your changes. > - Finally your changes arrive via the new release of S. > > That *is* the intended use-case for submodules. But you have to play the > game by the rules: > > - $Maintainer defines the official states of S. > > - You must never commit an unofficial state of S in P.
I think the issue here is that $Maintainer = him (or Maintainers(P) = Maintainers(S), in general); the workflow you described still works, but is overly complicated and that is the original complaint.
Petr "Pasky" Baudis