Merge branch 'rs/diff-parseopts-cleanup' into maint-2.45
Code clean-up to remove code that is now a noop. * rs/diff-parseopts-cleanup: diff-lib: stop calling diff_setup_done() in do_diff_cache()maint
commit
a5adab9b16
|
@ -660,7 +660,6 @@ int do_diff_cache(const struct object_id *tree_oid, struct diff_options *opt)
|
||||||
|
|
||||||
repo_init_revisions(opt->repo, &revs, NULL);
|
repo_init_revisions(opt->repo, &revs, NULL);
|
||||||
copy_pathspec(&revs.prune_data, &opt->pathspec);
|
copy_pathspec(&revs.prune_data, &opt->pathspec);
|
||||||
diff_setup_done(&revs.diffopt);
|
|
||||||
revs.diffopt = *opt;
|
revs.diffopt = *opt;
|
||||||
|
|
||||||
if (diff_cache(&revs, tree_oid, NULL, 1))
|
if (diff_cache(&revs, tree_oid, NULL, 1))
|
||||||
|
|
Loading…
Reference in New Issue