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 /tree-diff.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 'tree-diff.c')
| -rw-r--r-- | tree-diff.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tree-diff.c b/tree-diff.c index ccf9d7c8f..456660c7a 100644 --- a/tree-diff.c +++ b/tree-diff.c @@ -254,7 +254,9 @@ static void try_to_follow_renames(struct tree_desc *t1, struct tree_desc *t2, co path[0] = p->one->path; path[1] = NULL; free_pathspec(&opt->pathspec); - parse_pathspec(&opt->pathspec, PATHSPEC_ALL_MAGIC, 0, "", path); + parse_pathspec(&opt->pathspec, + PATHSPEC_ALL_MAGIC & ~PATHSPEC_LITERAL, + PATHSPEC_LITERAL_PATH, "", path); /* * The caller expects us to return a set of vanilla |