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

6
builtin/stash.c
View File

@@ -974,7 +974,7 @@ static int show_stash(int argc, const char **argv, const char *prefix)
}
log_tree_diff_flush(&rev);
ret = diff_result_code(&rev.diffopt);
ret = diff_result_code(&rev);
cleanup:
strvec_clear(&revision_args);
@@ -1126,13 +1126,13 @@ static int check_changes_tracked_files(const struct pathspec *ps)
diff_setup_done(&rev.diffopt);
run_diff_index(&rev, DIFF_INDEX_CACHED);
if (diff_result_code(&rev.diffopt)) {
if (diff_result_code(&rev)) {
ret = 1;
goto done;
}
run_diff_files(&rev, 0);
if (diff_result_code(&rev.diffopt)) {
if (diff_result_code(&rev)) {
ret = 1;
goto done;
}