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

[thirdparty/git.git] / revision.c

diff --git a/revision.c b/revision.c
index 0173e0148b850bd1a3e2e7e5c652050ade6d5ba4..9b9e22ee45948df3a9e261d361d10896f40b87b7 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -1372,7 +1372,8 @@ static void prepare_show_merge(struct rev_info *revs)
                        i++;
        }
        free_pathspec(&revs->prune_data);
-       parse_pathspec(&revs->prune_data, PATHSPEC_ALL_MAGIC, 0, "", prune);
+       parse_pathspec(&revs->prune_data, PATHSPEC_ALL_MAGIC & ~PATHSPEC_LITERAL,
+                      PATHSPEC_LITERAL_PATH, "", prune);
        revs->limited = 1;
 }