From: Duy Nguyen <pclouds@gmail.com>
Date: Fri, 25 Oct 2013 04:11:21 GMT
Subject: Re: [BUG] "git --literal-pathspecs blame" broken in master
Message-ID: <CACsJy8AYS8VLuuZ_4rVvrG8SV_aq8dtNa0TqfcjEmow05RSP_A@mail.gmail.com>
In-Reply-To: <20131025034947.GA4959@sigill.intra.peff.net>

On Fri, Oct 25, 2013 at 10:49 AM, Jeff King <peff@peff.net> wrote:
>   $ 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.

I checked it too strict. Something like this should fix it. I'll post
a patch with tests later

diff --git a/pathspec.c b/pathspec.c
index ad1a9f5..69e4fdb 100644
--- a/pathspec.c
+++ b/pathspec.c
@@ -405,7 +405,7 @@ void parse_pathspec(struct pathspec *pathspec,
                item[i].magic = prefix_pathspec(item + i, &short_magic,
                                                argv + i, flags,
                                                prefix, prefixlen, entry);
-               if (item[i].magic & magic_mask)
+               if (item[i].magic & (magic_mask & ~PATHSPEC_LITERAL))
                        unsupported_magic(entry,
                                          item[i].magic & magic_mask,
                                          short_magic);

-- 
Duy