Re: [BUG] "git --literal-pathspecs blame" broken in master

[Duy Nguyen <pclouds@gmail.com>]

On Fri, Oct 25, 2013 at 11:04 AM, Jeff King <peff@peff.net> wrote:
> On Thu, Oct 24, 2013 at 11:49:47PM -0400, Jeff King wrote:
>
>> We get another change with a16bf9d (pathspec: make --literal-pathspecs
>> disable pathspec magic, 2013-07-14), which I would think would fix
>> things, but doesn't.
>>
>>   $ git blame ':(foo)bar'
>>   fatal: Invalid pathspec magic 'foo' in ':(foo)bar'
>>   $ git --literal-pathspecs blame ':(foo)bar'
>>   fatal: :(foo)bar: pathspec magic not supported by this command: 'literal'
>>
>> The first one remains good, but the second one is still broken. I
>> haven't dug further yet, but I thought it might be a bit more obvious to
>> you.
>
> Hmm. Is the fix as simple as:
>
> diff --git a/builtin/blame.c b/builtin/blame.c
> index 56e3d6b..1c2b303 100644
> --- a/builtin/blame.c
> +++ b/builtin/blame.c
> @@ -408,7 +408,7 @@ static struct origin *find_origin(struct scoreboard *sb,
>         paths[0] = origin->path;
>         paths[1] = NULL;
>
> -       parse_pathspec(&diff_opts.pathspec, PATHSPEC_ALL_MAGIC, 0, "", paths);
> +       parse_pathspec(&diff_opts.pathspec, PATHSPEC_ALL_MAGIC & ~PATHSPEC_LITERAL, 0, "", paths);
>         diff_setup_done(&diff_opts);
>
>         if (is_null_sha1(origin->commit->object.sha1))
>
> All of the GUARD_PATHSPEC calls indicate that everybody understands
> PATHSPEC_LITERAL. It is not technically true that git-blame understands
> the literal pathspec magic:
>
>   $ git blame -- ':(literal)revision.c'
>   fatal: no such path ':(literal)revision.c' in HEAD
>
> but that is a separate bug (that blame considers the argument as a path
> first before feeding it to the pathspec machinery). The patch above does
> not fix that, but AFAICT it does not make anything worse.

I did consider this change but dropped it because there are more
parse_pathspec() calls with PATHSPEC_ALL_MAGIC as mask. Thanks for
bringing up ":(literal)".  I guess we need to change prefix_pathspec()
to set PATHSPEC_LITERAL only when :(literal) is present, not when
--literal-pathspecs is used.
-- 
Duy