Convert struct diff_options to use struct pathspec

[thirdparty/git.git] / revision.c

diff --git a/revision.c b/revision.c
index 7b9eaefae4ed03e994c2122453144b3c09591b9c..0c511aa44b100fd0c8f28dd814bd46795162f7a3 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -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) {