diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2010-12-15 22:02:38 +0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-02-03 12:28:15 -0800 |
| commit | 66f136252fe1998e2c1381c913795b5f56b6dc8c (patch) | |
| tree | 60cc0586003999c1c3d74c0ab2847a20decff6df /revision.c | |
| parent | 16dc36fea87e917a7f734400eb91e62e170db1a8 (diff) | |
| download | git-66f136252fe1998e2c1381c913795b5f56b6dc8c.tar.gz git-66f136252fe1998e2c1381c913795b5f56b6dc8c.tar.xz | |
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>
Diffstat (limited to 'revision.c')
| -rw-r--r-- | revision.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/revision.c b/revision.c index 7b9eaefae..0c511aa44 100644 --- 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) { |