Re: [BUG] 'diff A...B' fails with multiple merge bases

From: Junio C Hamano <gitster@pobox.com>
Date: Jul 13, 2010, 00:45 UTC
Message-ID: <7vy6dg5hwl.fsf@alter.siamese.dyndns.org>
In-Reply-To: <AANLkTinfo1QDguIbNgOt9w9V9xuJbhrCmusfe9g8fosm@mail.gmail.com>

Sverre Rabbelier <srabbelier@gmail.com> writes:

Show 12 quoted lines

> Heya,
>
> On Mon, Jul 12, 2010 at 19:25, Junio C Hamano <gitster@pobox.com> wrote:
>> +               if (ents != i + 2 ||
>> +                   (ent[i+1].item->flags & UNINTERESTING) ||
>> +                   (!ent[i].item->flags & SYMMETRIC_LEFT) ||
>> +                   (ent[i+1].item->flags & SYMMETRIC_LEFT))
>> +                       die("what do you mean by that?");
>
> That's about as helpful an error message as "Your parents must hate
> you" or whatever it is. Can we rephrase it to tell the user what they
> did wrong, and how to fix it?

This will trigger only when you did something random like this.

    $ git diff ^maint master ^next ^pu sr/frotz..

What else would you say against such an input?