diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-09-16 14:22:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-09-16 14:22:55 -0700 |
| commit | be8ca2848a9e73f6ddc31ebce2ddc3c367d4f0cb (patch) | |
| tree | 517a2dce7d35fd6a2b98ea2f6114563cc4e0cfb7 /builtin/diff.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.gz 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 'builtin/diff.c')
| -rw-r--r-- | builtin/diff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/diff.c b/builtin/diff.c index 6eac445579..5fb8a5545e 100644 --- a/builtin/diff.c +++ b/builtin/diff.c @@ -619,7 +619,7 @@ int cmd_diff(int argc, const char **argv, const char *prefix) builtin_diff_combined(&rev, argc, argv, ent.objects, ent.nr, first_non_parent); - result = diff_result_code(&rev.diffopt); + result = diff_result_code(&rev); if (1 < rev.diffopt.skip_stat_unmatch) refresh_index_quietly(); release_revisions(&rev); |