summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-11-18 22:31:29 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-11-18 22:31:29 (GMT)
commitc6f1b920ac8b41b9175910d5866924a12a0ce6b9 (patch)
treeddc33851da0035b36eb67c1dbe6b83b28342420c /builtin
parent33da0c9c3c2ec2706c80f70226739f14a66baa21 (diff)
parent4a2d5ae262a6d372d0951da9cee3c7ad2a8dbca6 (diff)
downloadgit-c6f1b920ac8b41b9175910d5866924a12a0ce6b9.zip
git-c6f1b920ac8b41b9175910d5866924a12a0ce6b9.tar.gz
git-c6f1b920ac8b41b9175910d5866924a12a0ce6b9.tar.bz2
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 'builtin')
-rw-r--r--builtin/blame.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/builtin/blame.c b/builtin/blame.c
index 6da7233..1407ae7 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))