From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 23 Mar 2017 21:38:57 GMT
Subject: Re: Bug: Revert with -m 0 says no -m was given
Message-ID: <xmqqmvcbad1q.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <CACBZZX5e-p4gKSWxehhVnnSgApC9H2v_ud+1Drz-vu_OAZwCgg@mail.gmail.com>

Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:

> On Thu, Mar 23, 2017 at 7:15 PM, Junio C Hamano <gitster@pobox.com> wrote:
>> Ulrik Sverdrup <ulrik.sverdrup@gmail.com> writes:
>>
>>> Git produces a misleading error when you tell it `git revert -m 0`.
>>
>> Thanks.
>>
>> I think this is the same issue as the one with 'cherry-pick' that
>> was reported earlier.  We have a fix in the 'master' branch already;
>> please try it out.
>
> Specifically, in master:
>
> $ ./git revert afd6726309
> error: commit afd6726309f57f532b4b989a75c1392359c611cc is a merge but
> no -m option was given.
> fatal: revert failed
> $ ./git revert -m 0 afd6726309
> error: option `mainline' expects a number greater than zero

Yes, exactly.

Thanks.