Convert struct diff_options 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
16dc36fea8
commit
66f136252f
@ -553,11 +553,7 @@ static void cherry_pick_list(struct commit_list *list, struct rev_info *revs)
|
||||
|
||||
left_first = left_count < right_count;
|
||||
init_patch_ids(&ids);
|
||||
if (revs->diffopt.nr_paths) {
|
||||
ids.diffopts.nr_paths = revs->diffopt.nr_paths;
|
||||
ids.diffopts.paths = revs->diffopt.paths;
|
||||
ids.diffopts.pathlens = revs->diffopt.pathlens;
|
||||
}
|
||||
ids.diffopts.pathspec = revs->diffopt.pathspec;
|
||||
|
||||
/* Compute patch-ids for one side */
|
||||
for (p = list; p; p = p->next) {
|
||||
|
Reference in New Issue
Block a user