diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-10-14 12:56:09 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-10-14 12:56:09 -0700 |
| commit | deb58e4fa37a30ce56904b3f51308f3aa81d30a0 (patch) | |
| tree | 1118748c41469388bb812a11af5799a7ff688f91 /range-diff.h | |
| parent | Merge branch 'en/xdiff-cleanup' (diff) | |
| parent | format-patch: handle range-diff on notes correctly for single patches (diff) | |
| download | git-deb58e4fa37a30ce56904b3f51308f3aa81d30a0.tar.gz git-deb58e4fa37a30ce56904b3f51308f3aa81d30a0.zip | |
Merge branch 'kh/format-patch-range-diff-notes'
"git format-patch --range-diff=... --notes=..." did not drive the
underlying range-diff with correct --notes parameter, ending up
comparing with different set of notes from its main patch output
you would get from "git format-patch --notes=..." for a singleton
patch.
* kh/format-patch-range-diff-notes:
format-patch: handle range-diff on notes correctly for single patches
revision: add rdiff_log_arg to rev_info
range-diff: rename other_arg to log_arg
Diffstat (limited to 'range-diff.h')
| -rw-r--r-- | range-diff.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/range-diff.h b/range-diff.h index 9d39818e34..9b70a80009 100644 --- a/range-diff.h +++ b/range-diff.h @@ -23,7 +23,7 @@ struct range_diff_options { unsigned include_merges:1; size_t max_memory; const struct diff_options *diffopt; /* may be NULL */ - const struct strvec *other_arg; /* may be NULL */ + const struct strvec *log_arg; /* may be NULL */ }; /* |