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 /revision.c | |
| parent | bb5d531efa804bbf09064e4a7ce65e096599f3c7 (diff) | |
| parent | d2446dfd7f3b3f8948142cfb07a0270e2497d93f (diff) | |
| download | git-jk/remove-deprecated.tar.gz | |
Sync with 1.8.5jk/remove-deprecated
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 956040c8c8..a8adb3fc88 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; } |