diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-05-02 11:21:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-05-02 11:21:46 -0700 |
| commit | 4c0d9e09ef04363ad760694556ec1387d804f1d9 (patch) | |
| tree | 7dd79eb5db6a5c02748dffd2521b1e174ed9339c | |
| parent | b0a23d7029f94e8372e8fddc6ce051b215c138d6 (diff) | |
| parent | a5a4cb7b278b53a6c490dd249eadedb4cc306fab (diff) | |
| download | git-4c0d9e09ef04363ad760694556ec1387d804f1d9.tar.gz | |
Merge branch 'rs/diff-parseopts-cleanup' into jch
Notice: this object is not reachable from any branch.
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()
Notice: this object is not reachable from any branch.
| -rw-r--r-- | diff-lib.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/diff-lib.c b/diff-lib.c index 683f11e509..12b1541478 100644 --- a/diff-lib.c +++ b/diff-lib.c @@ -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); copy_pathspec(&revs.prune_data, &opt->pathspec); - diff_setup_done(&revs.diffopt); revs.diffopt = *opt; if (diff_cache(&revs, tree_oid, NULL, 1)) |