Git development
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Miklos Vajna <vmiklos@frugalware.org>
Cc: Sverre Hvammen Johansen <hvammen+git@gmail.com>, git@vger.kernel.org
Subject: Re: [PATCH/Test] Build in merge is broken
Date: Sun, 13 Jul 2008 12:11:42 -0700	[thread overview]
Message-ID: <7v3amdtx8x.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <20080713184300.GF10347@genesis.frugalware.org> (Miklos Vajna's message of "Sun, 13 Jul 2008 20:43:00 +0200")

Miklos Vajna <vmiklos@frugalware.org> writes:

> On Sun, Jul 13, 2008 at 07:46:59PM +0200, Miklos Vajna <vmiklos@frugalware.org> wrote:
>> 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().
>
> This fixes the problem for me. Junio, does the fix looks correct to you
> as well?

You are correct, the "item"s are the highlander (i.e. "there can be only
one") objects but commit-list elements that hold pointers to them are not,
so we need to dereference and compare.

Thanks.

  reply	other threads:[~2008-07-13 19:12 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
2008-07-13 18:43     ` Miklos Vajna
2008-07-13 19:11       ` Junio C Hamano [this message]
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=7v3amdtx8x.fsf@gitster.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=hvammen+git@gmail.com \
    --cc=vmiklos@frugalware.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox