Merge branch 'nd/literal-pathspecs'

Fixes a regression on 'master' since v1.8.4.

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

diff --cc revision.c
index 956040c8c8fdd79c081acfaa466e4f3acc69507e,9b9e22ee45948df3a9e261d361d10896f40b87b7..a8adb3fc8891a73fb4017d18b00020bca790c766
--- 1/revision.c
--- 2/revision.c
+++ b/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;
  }