From: Lars Hjemli Date: Wed, 14 May 2008 10:54:32 GMT Subject: Re: [PATCH v2] revision.c: really honor --first-parent Message-ID: <8c5c35580805140354s62301343n62f8319b1853bfbd@mail.gmail.com> In-Reply-To: <20080514103454.GA28610@cuci.nl> On Wed, May 14, 2008 at 12:34 PM, Stephen R. van den Berg 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