diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-12-05 14:11:11 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-12-05 14:11:20 -0800 |
| commit | 15a42a10ec71eb18983750562a2a8a43b224fef0 (patch) | |
| tree | 2c208dd06917ffc4361cee469bfd3d9b7e5405cb /tree-diff.c | |
| parent | bb5d531efa804bbf09064e4a7ce65e096599f3c7 (diff) | |
| parent | d2446dfd7f3b3f8948142cfb07a0270e2497d93f (diff) | |
| download | git-jk/remove-deprecated.tar.gz | |
Sync with 1.8.5jk/remove-deprecated
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 ccf9d7c8fd..456660c7a2 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 |