On Mon, Apr 3, 2017 at 11:26 PM, Brandon Williams <bmwill@xxxxxxxxxx> wrote:
> On 04/03, Patrick Steinhardt wrote:
>> Previous to commit 5d8f084a5 (pathspec: simpler logic to prefix original
>> pathspec elements, 2017-01-04), we were always using the computed
>> `match` variable to perform pathspec matching whenever
>> `PATHSPEC_PREFIX_ORIGIN` is set. This is for example useful when passing
>> the parsed pathspecs to other commands, as the computed `match` may
>> contain a pathspec relative to the repository root. The commit changed
>> this logic to only do so when we do have an actual prefix and when
>> literal pathspecs are deactivated.
>>
>> But this change may actually break some commands which expect passed
>> pathspecs to be relative to the repository root. One such case is `git
>> add --patch`, which now fails when using relative paths from a
>> subdirectory. For example if executing "git add -p ../foo.c" in a
>> subdirectory, the `git-add--interactive` command will directly pass
>> "../foo.c" to `git-ls-files`. As ls-files is executed at the
>> repository's root, the command will notice that "../foo.c" is outside
>> the repository and fail.
Oops. Sorry I missed this.
>> @@ -504,12 +504,12 @@ static void init_pathspec_item(struct pathspec_item *item, unsigned flags,
>> * Prefix the pathspec (keep all magic) and assign to
>> * original. Useful for passing to another command.
>> */
>> - if ((flags & PATHSPEC_PREFIX_ORIGIN) &&
>> - prefixlen && !get_literal_global()) {
>> + if (flags & PATHSPEC_PREFIX_ORIGIN) {
>> struct strbuf sb = STRBUF_INIT;
>>
>> /* Preserve the actual prefix length of each pattern */
>> - prefix_magic(&sb, prefixlen, element_magic);
>> + if (prefixlen && !get_literal_global())
>> + prefix_magic(&sb, prefixlen, element_magic);
>>
>> strbuf_addstr(&sb, match);
>> item->original = strbuf_detach(&sb, NULL);
>
> Would it just make sense to drop the requirement that prefixlen be
> non-zero? My problem with this change currently is the ability to get
> an original string with is empty (ie "\0") which would cause git to
> throw some warnings about not allowing empty strings as pathspecs if
> they were then passed on to other processes.
Good catch.
I did wonder if it's a right thing, because the result pathspec is
':(prefix:0)'. After leaving out the magic path, you get an empty
"path" of the pathspec, which probably should be warned because we
wouldn't be able to handle it. For example, "git add ." at root will
give you the path ".", not empty one. Maybe we can't handle the empty
"path" part.
But we have an exception for this already. In "git add :/", the "path"
of the pathspec is still empty ('/' is a magic, not "path" even if it
looks like so) and we handle it just fine. So everything should be
good here.
Patrick, please add a line or two about why you drop prefixlen when
you re-roll (or even better, make it a separate patch; this sounds
like an issue even before the code reorganization changes).
--
Duy