From: "Michał Kiedrowicz" <michal.kiedrowicz@gmail.com>
To: Jeff King <peff@peff.net>
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Sverre Rabbelier <srabbelier@gmail.com>,
Junio C Hamano <gitster@pobox.com>,
Anders Melchiorsen <mail@cup.kalibalik.dk>,
Tuncer Ayaz <tuncer.ayaz@gmail.com>,
git@vger.kernel.org
Subject: Re: correct git merge behavior or corner case?
Date: Tue, 21 Apr 2009 20:47:01 +0200 [thread overview]
Message-ID: <20090421204701.1e0115c0@gmail.com> (raw)
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
next prev parent reply other threads:[~2009-04-21 18:50 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-04-19 22:40 correct git merge behavior or corner case? Tuncer Ayaz
2009-04-20 3:19 ` Shawn O. Pearce
2009-04-20 9:49 ` Johannes Schindelin
2009-04-20 10:10 ` Anders Melchiorsen
2009-04-21 2:44 ` Jeff King
2009-04-21 2:51 ` Jeff King
2009-04-21 3:09 ` Junio C Hamano
2009-04-21 8:48 ` Sverre Rabbelier
2009-04-21 8:56 ` Johannes Schindelin
2009-04-21 9:00 ` Sverre Rabbelier
2009-04-21 9:04 ` Johannes Schindelin
2009-04-21 9:01 ` Johannes Schindelin
2009-04-21 17:27 ` Michał Kiedrowicz
2009-04-21 17:54 ` Michał Kiedrowicz
2009-04-21 18:05 ` Jeff King
2009-04-21 18:47 ` Michał Kiedrowicz [this message]
2009-04-21 19:11 ` Jeff King
-- strict thread matches above, loose matches on Subject: below --
2009-04-20 14:50 François Beausoleil
2009-04-21 19:27 ` Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090421204701.1e0115c0@gmail.com \
--to=michal.kiedrowicz@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=mail@cup.kalibalik.dk \
--cc=peff@peff.net \
--cc=srabbelier@gmail.com \
--cc=tuncer.ayaz@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).