Merge branch 'nd/literal-pathspecs'
authorJunio C Hamano <gitster@pobox.com>
Mon, 18 Nov 2013 22:31:29 +0000 (18 14:31 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 18 Nov 2013 22:31:29 +0000 (18 14:31 -0800)
Fixes a regression on 'master' since v1.8.4.

* nd/literal-pathspecs:
  pathspec: stop --*-pathspecs impact on internal parse_pathspec() uses

1  2 
revision.c

diff --cc revision.c
@@@ -1372,8 -1372,8 +1372,8 @@@ static void prepare_show_merge(struct r
                        i++;
        }
        free_pathspec(&revs->prune_data);
-       parse_pathspec(&revs->prune_data, PATHSPEC_ALL_MAGIC,
-                      PATHSPEC_PREFER_FULL, "", prune);
+       parse_pathspec(&revs->prune_data, PATHSPEC_ALL_MAGIC & ~PATHSPEC_LITERAL,
 -                     PATHSPEC_LITERAL_PATH, "", prune);
++                     PATHSPEC_PREFER_FULL | PATHSPEC_LITERAL_PATH, "", prune);
        revs->limited = 1;
  }