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 /diff-no-index.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 'diff-no-index.c')
| -rw-r--r-- | diff-no-index.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/diff-no-index.c b/diff-no-index.c index 3a8965672c..c5fb06e6d1 100644 --- a/diff-no-index.c +++ b/diff-no-index.c @@ -362,7 +362,7 @@ int diff_no_index(struct rev_info *revs, * The return code for --no-index imitates diff(1): * 0 = no changes, 1 = changes, else error */ - ret = diff_result_code(&revs->diffopt); + ret = diff_result_code(revs); out: for (i = 0; i < ARRAY_SIZE(to_free); i++) |