mirror of
https://github.com/git/git.git
synced 2026-03-17 12:10:08 +01:00
Convert ce_path_match() to use struct pathspec
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
committed by
Junio C Hamano
parent
ec56c4d81d
commit
39b99a26cf
@@ -106,7 +106,7 @@ int run_diff_files(struct rev_info *revs, unsigned int option)
|
||||
DIFF_OPT_TST(&revs->diffopt, HAS_CHANGES))
|
||||
break;
|
||||
|
||||
if (!ce_path_match(ce, revs->prune_data.raw))
|
||||
if (!ce_path_match(ce, &revs->prune_data))
|
||||
continue;
|
||||
|
||||
if (ce_stage(ce)) {
|
||||
@@ -427,7 +427,7 @@ static int oneway_diff(struct cache_entry **src, struct unpack_trees_options *o)
|
||||
if (tree == o->df_conflict_entry)
|
||||
tree = NULL;
|
||||
|
||||
if (ce_path_match(idx ? idx : tree, revs->prune_data.raw))
|
||||
if (ce_path_match(idx ? idx : tree, &revs->prune_data))
|
||||
do_oneway_diff(o, idx, tree);
|
||||
|
||||
return 0;
|
||||
|
||||
Reference in New Issue
Block a user