bekucera/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2025-09-10 22:44:50 +02:00
Code Issues 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

18
builtin/log.c
View File

@@ -504,13 +504,7 @@ static int cmd_log_walk_no_free(struct rev_info *rev)
struct commit *commit;
int saved_nrl = 0;
int saved_dcctc = 0;
if (rev->remerge_diff) {
rev->remerge_objdir = tmp_objdir_create("remerge-diff");
if (!rev->remerge_objdir)
die(_("unable to create temporary object directory"));
tmp_objdir_replace_primary_odb(rev->remerge_objdir, 1);
}
int result;
if (rev->early_output)
setup_early_output();
@@ -551,16 +545,12 @@ static int cmd_log_walk_no_free(struct rev_info *rev)
rev->diffopt.degraded_cc_to_c = saved_dcctc;
rev->diffopt.needed_rename_limit = saved_nrl;
if (rev->remerge_diff) {
tmp_objdir_destroy(rev->remerge_objdir);
rev->remerge_objdir = NULL;
}
result = diff_result_code(rev);
if (rev->diffopt.output_format & DIFF_FORMAT_CHECKDIFF &&
rev->diffopt.flags.check_failed) {
return 02;
result = 02;
}
return diff_result_code(&rev->diffopt);
return result;
}
static int cmd_log_walk(struct rev_info *rev)