From: Miklos Vajna <vmiklos@frugalware.org>
To: Sverre Hvammen Johansen <hvammen+git@gmail.com>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH/Test] Build in merge is broken
Date: Sun, 13 Jul 2008 19:46:59 +0200 [thread overview]
Message-ID: <20080713174659.GE10347@genesis.frugalware.org> (raw)
In-Reply-To: <20080713124100.GB10347@genesis.frugalware.org>
[-- Attachment #1: Type: text/plain, Size: 709 bytes --]
On Sun, Jul 13, 2008 at 02:41:00PM +0200, Miklos Vajna <vmiklos@frugalware.org> wrote:
> > The test case when run will record the parents that were asked for which is
> > fine. However, only c2 is recorded as a parent in the commit object. Both
> > c1 and c2 should have been recorded. The merge is otherwise working
> > correctly.
>
> Thanks for the testcase, I'm on it. ;-)
So far what I see is that the input for the reduce_heads() function is
(c1, c0, c2, c0, c1). The expected output would be (c1, c2), but the
actual output is c2. So I suspect the bug is not in builtin-merge.c
itself but in reduce_heads().
Hmm..
Adding Junio to Cc, who is the original author of reduce_heads().
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
next prev parent reply other threads:[~2008-07-13 17:48 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-13 8:13 [PATCH/Test] Build in merge is broken Sverre Hvammen Johansen
2008-07-13 12:41 ` Miklos Vajna
2008-07-13 17:46 ` Miklos Vajna [this message]
2008-07-13 18:43 ` Miklos Vajna
2008-07-13 19:11 ` Junio C Hamano
2008-07-14 2:15 ` Sverre Hvammen Johansen
2008-07-14 2:53 ` Junio C Hamano
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=20080713174659.GE10347@genesis.frugalware.org \
--to=vmiklos@frugalware.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=hvammen+git@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