Merge branch 'ps/pathspec-empty-prefix-origin'
authorJunio C Hamano <gitster@pobox.com>
Wed, 26 Apr 2017 06:39:03 +0000 (15:39 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 26 Apr 2017 06:39:03 +0000 (15:39 +0900)
A recent update broke "git add -p ../foo" from a subdirectory.

* ps/pathspec-empty-prefix-origin:
  pathspec: honor `PATHSPEC_PREFIX_ORIGIN` with empty prefix

1  2 
pathspec.c

diff --combined pathspec.c
@@@ -505,7 -505,7 +505,7 @@@ static void init_pathspec_item(struct p
         * original. Useful for passing to another command.
         */
        if ((flags & PATHSPEC_PREFIX_ORIGIN) &&
-           prefixlen && !get_literal_global()) {
+           !get_literal_global()) {
                struct strbuf sb = STRBUF_INIT;
  
                /* Preserve the actual prefix length of each pattern */
@@@ -724,7 -724,7 +724,7 @@@ void clear_pathspec(struct pathspec *pa
                free(pathspec->items[i].match);
                free(pathspec->items[i].original);
  
 -              for (j = 0; j < pathspec->items[j].attr_match_nr; j++)
 +              for (j = 0; j < pathspec->items[i].attr_match_nr; j++)
                        free(pathspec->items[i].attr_match[j].value);
                free(pathspec->items[i].attr_match);