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 /builtin/blame.c | |
parent | stop installing git-tar-tree link (diff) | |
parent | Git 1.8.5 (diff) | |
download | tgif-15a42a10ec71eb18983750562a2a8a43b224fef0.tar.xz |
Sync with 1.8.5
Diffstat (limited to 'builtin/blame.c')
-rw-r--r-- | builtin/blame.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/builtin/blame.c b/builtin/blame.c index 6da7233968..1407ae7eb2 100644 --- a/builtin/blame.c +++ b/builtin/blame.c @@ -409,7 +409,9 @@ static struct origin *find_origin(struct scoreboard *sb, paths[0] = origin->path; paths[1] = NULL; - parse_pathspec(&diff_opts.pathspec, PATHSPEC_ALL_MAGIC, 0, "", paths); + parse_pathspec(&diff_opts.pathspec, + PATHSPEC_ALL_MAGIC & ~PATHSPEC_LITERAL, + PATHSPEC_LITERAL_PATH, "", paths); diff_setup_done(&diff_opts); if (is_null_sha1(origin->commit->object.sha1)) |