From: "SZEDER Gábor" <szeder@ira.uka.de>
To: Samuel Tardieu <sam@rfc1149.net>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
Anders Melchiorsen <mail@cup.kalibalik.dk>,
git@vger.kernel.org
Subject: Re: [BUG] fatal error during merge
Date: Thu, 13 Nov 2008 15:03:23 +0100 [thread overview]
Message-ID: <20081113140323.GA10267@neumann> (raw)
In-Reply-To: <2008-11-13-14-23-19+trackit+sam@rfc1149.net>
Hi,
On Thu, Nov 13, 2008 at 02:23:19PM +0100, Samuel Tardieu wrote:
> >>>>> "Anders" == Anders Melchiorsen <mail@cup.kalibalik.dk> writes:
>
> Anders> I have tested the script with Git 1.6.0.2, but the real
> Anders> scenario that made this appear seems to also fail with master
> Anders> and next from git.git.
>
> I confirm that your test case also fails with the current "next".
Yeah, and it can be bisected to commit 621ff675 (rev-parse: fix
meaning of rev~ vs rev~0, 2008-03-14), which is from Linus, so put him
on Cc.
Best,
Gábor
next prev parent reply other threads:[~2008-11-13 14:20 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-11-13 9:22 [BUG] fatal error during merge Anders Melchiorsen
2008-11-13 13:23 ` Samuel Tardieu
2008-11-13 14:03 ` SZEDER Gábor [this message]
2008-11-13 14:25 ` Anders Melchiorsen
2008-11-13 14:26 ` Samuel Tardieu
2008-11-13 14:53 ` SZEDER Gábor
2008-11-13 17:06 ` Anders Melchiorsen
2008-11-13 18:09 ` SZEDER Gábor
2008-11-13 22:25 ` Anders Melchiorsen
2008-11-13 23:09 ` Alex Riesen
2008-11-13 23:34 ` Anders Melchiorsen
2008-11-14 0:29 ` Junio C Hamano
2008-11-14 7:16 ` Alex Riesen
2008-11-14 9:16 ` Anders Melchiorsen
-- strict thread matches above, loose matches on Subject: below --
2009-05-10 16:33 Alex Riesen
2009-05-10 23:10 ` Johannes Schindelin
2009-05-11 7:39 ` Alex Riesen
2009-05-11 7:37 ` Anders Melchiorsen
2009-05-11 8:34 ` Johannes Schindelin
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=20081113140323.GA10267@neumann \
--to=szeder@ira.uka.de \
--cc=git@vger.kernel.org \
--cc=mail@cup.kalibalik.dk \
--cc=sam@rfc1149.net \
--cc=torvalds@linux-foundation.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.