From: "Lars Hjemli" <hjemli@gmail.com>
To: "Stephen R. van den Berg" <srb@cuci.nl>
Cc: "Junio C Hamano" <gitster@pobox.com>,
nanako3@bluebottle.com, git@vger.kernel.org
Subject: Re: [PATCH v2] revision.c: really honor --first-parent
Date: Wed, 14 May 2008 12:54:32 +0200 [thread overview]
Message-ID: <8c5c35580805140354s62301343n62f8319b1853bfbd@mail.gmail.com> (raw)
In-Reply-To: <20080514103454.GA28610@cuci.nl>
On Wed, May 14, 2008 at 12:34 PM, Stephen R. van den Berg <srb@cuci.nl> wrote:
> So, I'd say, since the current code does not and cannot work reliably
> for anyone specifically using --first-parent (with every merge
> encountered, the probability of correctness is multiplied by 0.5 at
> most/least), you are going to do them a favour anyway by fixing the code,
> then why not simplify the convolution and make the code rock-steady (and
> implement my patch)?
The current 'next' branch in git.git contains your patch with my fixup
on top and I believe this fixes _both_ the original issue with
first-parent (thanks to your patch) and the issue Nanako discovered
(thanks to my patch). Am I missing something?
--
larsh
next prev parent reply other threads:[~2008-05-14 10:55 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-05-11 7:03 "git log --first-parent" shows parents that are not first しらいしななこ
2008-05-11 18:44 ` Junio C Hamano
2008-05-11 23:14 ` [PATCH] revision.c: really honor --first-parent Lars Hjemli
2008-05-12 15:12 ` [PATCH v2] " Lars Hjemli
2008-05-13 20:15 ` Stephen R. van den Berg
2008-05-13 20:43 ` Lars Hjemli
2008-05-13 22:38 ` Junio C Hamano
2008-05-14 10:34 ` Stephen R. van den Berg
2008-05-14 10:54 ` Lars Hjemli [this message]
2008-05-14 11:10 ` Stephen R. van den Berg
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=8c5c35580805140354s62301343n62f8319b1853bfbd@mail.gmail.com \
--to=hjemli@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=nanako3@bluebottle.com \
--cc=srb@cuci.nl \
/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).