Re: [PATCH] Avoid the need of "--" when wildcard pathspec is used

From: Duy Nguyen <pclouds@gmail.com>
Date: Jun 30, 2015, 23:07 UTC
Message-ID: <CACsJy8C0Pz8ZjzW+n=3kT3c+x+CBONUuk27SNMiMsYwCapnVjA@mail.gmail.com>
In-Reply-To: <xmqqk2ulcbj3.fsf@gitster.dls.corp.google.com>

On Wed, Jul 1, 2015 at 1:10 AM, Junio C Hamano <gitster@pobox.com> wrote:

Show 11 quoted lines

> Nguyễn Thái Ngọc Duy  <pclouds@gmail.com> writes:
>
>> When "--" is lacking from the command line and a command can take both
>> revs and paths, the idea is if an argument can be seen as both an
>> extended SHA-1 and a path, then "--" is required or git refuses to
>> continue. It's currently implemented as:
>> ...
>
> Hmph, how does this relate to 28fcc0b7 (pathspec: avoid the need of
> "--" when wildcard is used, 2015-05-02)?  A follow-up?  "Oops, I did
> it wrong"?  something else?

Arghhh! I vaguely recalled I sent something but I couldn't find it and..

Show 9 quoted lines

>
>> diff --git a/setup.c b/setup.c
>> index 82c0cc2..f7cb93b 100644
>> --- a/setup.c
>> +++ b/setup.c
>> @@ -143,6 +143,8 @@ int check_filename(const char *prefix, const char *arg)
>>               name = arg + 2;
>>       } else if (!no_wildcard(arg))
>>               return 1;

.. if I looked at the context lines, I should have noticed the change was already here!

>> +     else if (!no_wildcard(arg))
>> +             return 1;

 Seems strange (or expected?) that git cherry-pick just adds this
chunk on top anyway..

> Puzzling.  You already checked if arg has an wildcard and returned
> with 1 if there is none.  The added check looks like a no-op to me.

Yeah sorry for the noise. The only value this patch adds is tests (and maybe better commit message, the last one still mentions magic pathspec even though it's not about it). I think we can just drop this.

-- 
Duy