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 /revision.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 'revision.h')
| -rw-r--r-- | revision.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/revision.h b/revision.h index a28e349044..b36acfc2d9 100644 --- a/revision.h +++ b/revision.h @@ -334,6 +334,7 @@ struct rev_info { /* range-diff */ const char *rdiff1; const char *rdiff2; + struct strvec rdiff_log_arg; int creation_factor; const char *rdiff_title; @@ -410,6 +411,7 @@ struct rev_info { .expand_tabs_in_log = -1, \ .commit_format = CMIT_FMT_DEFAULT, \ .expand_tabs_in_log_default = 8, \ + .rdiff_log_arg = STRVEC_INIT, \ } /** |