diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-09-16 23:22:54 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-09-16 23:22:55 +0200 |
| commit | be8ca2848a9e73f6ddc31ebce2ddc3c367d4f0cb (patch) | |
| tree | 517a2dce7d35fd6a2b98ea2f6114563cc4e0cfb7 /wt-status.c | |
| parent | Merge branch 'ah/apply-3way-ours' (diff) | |
| parent | remerge-diff: clean up temporary objdir at a central place (diff) | |
| download | git-be8ca2848a9e73f6ddc31ebce2ddc3c367d4f0cb.tar.xz git-be8ca2848a9e73f6ddc31ebce2ddc3c367d4f0cb.zip | |
Merge branch 'jc/range-diff-lazy-setup'
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
Diffstat (limited to 'wt-status.c')
| -rw-r--r-- | wt-status.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wt-status.c b/wt-status.c index b477239039..3e16491d0a 100644 --- a/wt-status.c +++ b/wt-status.c @@ -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; } |