Re: git submodule merge madness

From: Andreas Ericsson <ae@op5.se>
Date: Jan 12, 2009, 13:27 UTC
Message-ID: <496B4534.9020809@op5.se>
In-Reply-To: <ADC7A3B1-6756-4258-93CD-DB40C7D2793C@develooper.com>

Ask Bjørn Hansen wrote:

Show 16 quoted lines

> Hi,
> 
> We've (again) replaced a few directories with submodules.  Man, it's 
> madness!
> 
> The typical problem is that we get an error trying to merge a 
> "pre-submodule" branch into master:
> 
>     fatal: cannot read object 894c77319a18c4d48119c2985a9275c9f5883584 
> 'some/sub/dir': It is a submodule!
> Mark Levedahl wrote an example in July, but I don't think he got any 
> replies:  http://marc.info/?l=git&m=121587851313303
> Any ideas?   Is there something we can do?    I see a strong correlation 
> between adding a new submodule and the number of "git sucks" messages on 
> our internal IRC server.
>

Well, reworking the repository structure (which is essentially what you're doing) should be a flag day. Merge stuff before that and mark it in some way so that you don't run into the problems you're seeing now.

-- 
Andreas Ericsson                   andreas.ericsson@op5.se
OP5 AB                             www.op5.se
Tel: +46 8-230225                  Fax: +46 8-230231