Re: git submodule merge madness

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Jan 15, 2009, 00:36 UTC
Message-ID: <alpine.DEB.1.00.0901150134530.3586@pacific.mpi-cbg.de>
In-Reply-To: <AE1922C4-0543-424B-A635-494445E17E45@develooper.com>

Hi,

On Wed, 14 Jan 2009, Ask Bjørn Hansen wrote:

Show 22 quoted lines

> On Jan 14, 2009, at 2:55 PM, Johannes Schindelin wrote:
> 
> > >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
> >
> >So.... Which Git version are you are using?  Did you test any Git version
> >containing the commit d5a84fb(merge-recursive: fail gracefully with
> >directory/submodule conflicts)?
> 
> IIRC I tried 1.6.1 and master as of about a week ago.
> 
> I don't see d5a84fb in my repository (and google doesn't find it referenced
> anywhere when I search for "directory/submodule conflicts".

Well. Can do arithmetics in my head after midnight, but not think straight...

In any case, could you please provide a patch to the testsuite demonstrating the problem? History shows that such patches are very helpful.

Ciao, Dscho