Skip to content

format-patch: improve handling of `format.notes`

Denton Liu git 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest5 patches 5 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/5notes: rename to load_display_notes()builtin/log.c notes.c notes.h+6 -60 replies
2/5notes: create init_display_notes() helpernotes.c notes.h revision.c+12 -10 replies
3/5notes: extract logic into set_display_notes()notes.c notes.h revision.c+38 -163 replies
4/5format-patch: use --notes behavior for format.notesbuiltin/log.c t/t4014-format-patch.sh+33 -120 replies
5/5format-patch: move git_config() before repo_init_revisions()builtin/log.c+7 -40 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.

Read the v1 thread

Cover letter [PATCH 0/5] format-patch: improve handling of `format.notes`

In this email[1], Elijah pointed out that the handling of multiple format.notes configurations could be buggy. If we had format.notes = <ref1>, format.notes = false and format.notes = <ref2>, the behaviour is ambiguous. This series uses the way --notes=<ref1> --no-notes --notes=<ref2> is handled as a model and structures the handling of format.notes in a similar manner, allowing one format.notes = false to override previous configs.

Also, in the same email, it was pointed out that git_config() should be called before repo_init_revisions(). In 13cdf78094 (format-patch: teach format.notes config option, 2019-05-16), the order was reversed. This series changes it back such that git_config() is called before repo_init_revisions().

This series is based on top of 'dl/format-patch-notes-config'.

It has minor textual conflicts with 'pu'. The merge resolution can be found at
https://github.com/Denton-L/git.git on branch 'published/published/pu-format-patch-notes-config'.

[1]: https://lore.kernel.org/git/CABPp-BF44+6gvZVNimKf-k7AWbOjw3OK-cJeFunNR96wvZGkcw@mail.gmail.com/

Denton Liu (5):
notes: rename to load_display_notes()
notes: create init_display_notes() helper
notes: extract logic into set_display_notes()
format-patch: use --notes behavior for format.notes
format-patch: move git_config() before repo_init_revisions()

 builtin/log.c           | 26 +++++++++-----------------
 notes.c                 | 30 ++++++++++++++++++++++++++++++
 notes.h                 | 21 ++++++++++++++++++---
 revision.c              | 22 +++++-----------------
 t/t4014-format-patch.sh | 32 ++++++++++++++++++++++++++++++++
 5 files changed, 94 insertions(+), 37 deletions(-)
Signature · 1 line
2.24.0.627.geba02921db