Skip to content

Commit a5adab9

Browse files
committed
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()
2 parents fc636b4 + a5a4cb7 commit a5adab9

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

diff-lib.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -660,7 +660,6 @@ int do_diff_cache(const struct object_id *tree_oid, struct diff_options *opt)
660660

661661
repo_init_revisions(opt->repo, &revs, NULL);
662662
copy_pathspec(&revs.prune_data, &opt->pathspec);
663-
diff_setup_done(&revs.diffopt);
664663
revs.diffopt = *opt;
665664

666665
if (diff_cache(&revs, tree_oid, NULL, 1))

0 commit comments

Comments
 (0)