admin/git
1
0
Fork 0
Code Issues Pull Requests Actions 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

4
wt-status.c
View File

@@ -2595,7 +2595,7 @@ int has_unstaged_changes(struct repository *r, int ignore_submodules)
rev_info.diffopt.flags.quick = 1;
diff_setup_done(&rev_info.diffopt);
run_diff_files(&rev_info, 0);
result = diff_result_code(&rev_info.diffopt);
result = diff_result_code(&rev_info);
release_revisions(&rev_info);
return result;
}
@@ -2629,7 +2629,7 @@ int has_uncommitted_changes(struct repository *r,
diff_setup_done(&rev_info.diffopt);
run_diff_index(&rev_info, DIFF_INDEX_CACHED);
result = diff_result_code(&rev_info.diffopt);
result = diff_result_code(&rev_info);
release_revisions(&rev_info);
return result;
}