From: Michał Kiedrowicz <michal.kiedrowicz@gmail.com>
Date: Tue, 21 Apr 2009 18:47:01 GMT
Subject: Re: correct git merge behavior or corner case?
Message-ID: <20090421204701.1e0115c0@gmail.com>
In-Reply-To: <20090421180529.GA7583@coredump.intra.peff.net>

Jeff King <peff@peff.net> wrote:

> On Tue, Apr 21, 2009 at 07:54:34PM +0200, Michał Kiedrowicz wrote:
> 
> > And here is a test case:
> > [...]
> > +	echo "hello" > date &&
> > +	git add date &&
> > +	git commit -m initial &&
> > +
> > +	git branch parallel &&
> > +
> > +	echo "hello" > LICENSE &&
> > +	cp LICENSE LICENSE-copy &&
> > +	git add LICENSE &&
> > +	git commit -m LICENSE &&
> 
> I thought the point was about _empty_ renames. This is a small but
> non-zero rename.
> 
> -Peff

Yes, you are right. But change these echos to touch and you'll see that
this bug happens if date and LICENSE are the same, not necessary empty.

Michał Kiedrowicz