From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 18 Nov 2013 22:31:29 +0000 (-0800)
Subject: Merge branch 'nd/literal-pathspecs'
X-Git-Url: https://repo.or.cz/w/git/mingw.git/commitdiff_plain/c6f1b920ac8b41b9175910d5866924a12a0ce6b9

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
---

c6f1b920ac8b41b9175910d5866924a12a0ce6b9
diff --cc revision.c
index 956040c8c8,9b9e22ee45..a8adb3fc88
--- a/revision.c
+++ b/revision.c
@@@ -1372,8 -1372,8 +1372,8 @@@ static void prepare_show_merge(struct r
  			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_LITERAL_PATH, "", prune);
++		       PATHSPEC_PREFER_FULL | PATHSPEC_LITERAL_PATH, "", prune);
  	revs->limited = 1;
  }