mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'nd/literal-pathspecs'

Browse Source 
Fixes a regression on 'master' since v1.8.4.

* nd/literal-pathspecs:
  pathspec: stop --*-pathspecs impact on internal parse_pathspec() uses
This commit is contained in:
Junio C Hamano
2013-11-18 14:31:29 -08:00
parent 33da0c9c3c 4a2d5ae262
commit c6f1b920ac
6 changed files with 30 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
revision.c
View File

@ -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;
}