diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2013-07-14 15:35:58 +0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-15 10:56:09 -0700 |
| commit | bd1928df1d1cc6a10a7b275694d3504d9a041fae (patch) | |
| tree | da8837867af8d30a91cee8e085fd372ee300df67 /revision.c | |
| parent | 827f4d6c218448d58f934c0980b6366407261b74 (diff) | |
| download | git-bd1928df1d1cc6a10a7b275694d3504d9a041fae.tar.gz git-bd1928df1d1cc6a10a7b275694d3504d9a041fae.tar.xz | |
remove diff_tree_{setup,release}_paths
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 | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/revision.c b/revision.c index cdc7f45d5..c2d44b736 100644 --- a/revision.c +++ b/revision.c @@ -2154,12 +2154,13 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s revs->limited = 1; if (revs->prune_data.nr) { - diff_tree_setup_paths(revs->prune_data.raw, &revs->pruning); + copy_pathspec(&revs->pruning.pathspec, &revs->prune_data); /* Can't prune commits with rename following: the paths change.. */ if (!DIFF_OPT_TST(&revs->diffopt, FOLLOW_RENAMES)) revs->prune = 1; if (!revs->full_diff) - diff_tree_setup_paths(revs->prune_data.raw, &revs->diffopt); + copy_pathspec(&revs->diffopt.pathspec, + &revs->prune_data); } if (revs->combine_merges) revs->ignore_merges = 0; |