mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/range-diff-lazy-setup'

Browse Source 
Code clean-up.

* jc/range-diff-lazy-setup:
  remerge-diff: clean up temporary objdir at a central place
  remerge-diff: lazily prepare temporary objdir on demand
This commit is contained in:
Junio C Hamano
2024-09-16 14:22:54 -07:00
parent 6e2a18cb04 4460e052e0
commit be8ca2848a
13 changed files with 38 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
builtin/diff-tree.c
View File

@ -167,13 +167,6 @@ int cmd_diff_tree(int argc, const char **argv, const char *prefix)
opt->diffopt.rotate_to_strict = 1;
if (opt->remerge_diff) {
opt->remerge_objdir = tmp_objdir_create("remerge-diff");
if (!opt->remerge_objdir)
die(_("unable to create temporary object directory"));
tmp_objdir_replace_primary_odb(opt->remerge_objdir, 1);
}
/*
* NOTE! We expect "a..b" to expand to "^a b" but it is
* perfectly valid for revision range parser to yield "b ^a",
@ -238,10 +231,5 @@ int cmd_diff_tree(int argc, const char **argv, const char *prefix)
diff_free(&opt->diffopt);
}
if (opt->remerge_diff) {
tmp_objdir_destroy(opt->remerge_objdir);
opt->remerge_objdir = NULL;
}
return diff_result_code(&opt->diffopt);
return diff_result_code(opt);
}