diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-11-18 14:31:29 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-11-18 14:31:29 -0800 |
| commit | c6f1b920ac8b41b9175910d5866924a12a0ce6b9 (patch) | |
| tree | ddc33851da0035b36eb67c1dbe6b83b28342420c /revision.c | |
| parent | 33da0c9c3c2ec2706c80f70226739f14a66baa21 (diff) | |
| parent | 4a2d5ae262a6d372d0951da9cee3c7ad2a8dbca6 (diff) | |
| download | git-c6f1b920ac8b41b9175910d5866924a12a0ce6b9.tar.gz git-c6f1b920ac8b41b9175910d5866924a12a0ce6b9.tar.xz | |
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
Diffstat (limited to 'revision.c')
| -rw-r--r-- | revision.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/revision.c b/revision.c index 956040c8c..a8adb3fc8 100644 --- a/revision.c +++ b/revision.c @@ -1372,8 +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, - PATHSPEC_PREFER_FULL, "", prune); + parse_pathspec(&revs->prune_data, PATHSPEC_ALL_MAGIC & ~PATHSPEC_LITERAL, + PATHSPEC_PREFER_FULL | PATHSPEC_LITERAL_PATH, "", prune); revs->limited = 1; } |