From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 10 May 2015 19:17:30 GMT
Subject: Re: [PATCH] sequencer.c: abbreviate hashs placed in the middle of messages
Message-ID: <xmqqzj5cfdit.fsf@gitster.dls.corp.google.com>
In-Reply-To: <vpqwq0g2462.fsf@anie.imag.fr>

Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> writes:

> Junio C Hamano <gitster@pobox.com> writes:
>
>> I am not sure how that changes anything.
>>
>>     $ git cherry-pick 38e70713119c25ab5699df6b2fb13e4133d399ab
>>     error: that commit is a merge and you didn't give me -m <which-parent>
>>
>>     $ git cherry-pick 38e70713119c25ab5699df6b2fb13e4133d399ab
>>     error: the commit 38e707... is a merge and you didn't give me -m <which-parent>
>
> But ...
>
>     ./myscript.sh
>     error: that commit is a merge and you didn't give me -m <which-parent>

If myscript.sh did not take the user input, what would the first
thing you (who tried to run the script) would do?  At that point,
figuring out which wrong commit was fed to underlying cherry-pick
becomes a lot less important issue than figuring out _why_ the buggy
script fed a wrong commit to it, doesn't it?