From: Denton Liu <liu.denton@gmail.com>
To: Git Mailing List <git@vger.kernel.org>
Cc: Elijah Newren <newren@gmail.com>,
Junio C Hamano <gitster@pobox.com>,
Beat Bolli <dev+git@drbeat.li>, Pavel Roskin <plroskin@gmail.com>
Subject: [PATCH 0/5] format-patch: improve handling of `format.notes`
Date: Mon, 9 Dec 2019 05:10:36 -0800 [thread overview]
Message-ID: <cover.1575896661.git.liu.denton@gmail.com> (raw)
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(-)
--
2.24.0.627.geba02921db
next reply other threads:[~2019-12-09 13:10 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-09 13:10 Denton Liu [this message]
2019-12-09 13:10 ` [PATCH 1/5] notes: rename to load_display_notes() Denton Liu
2019-12-09 13:10 ` [PATCH 2/5] notes: create init_display_notes() helper Denton Liu
2019-12-09 13:10 ` [PATCH 3/5] notes: extract logic into set_display_notes() Denton Liu
2019-12-09 16:26 ` Eric Sunshine
2019-12-09 19:19 ` Denton Liu
2019-12-10 11:22 ` Philip Oakley
2019-12-09 13:10 ` [PATCH 4/5] format-patch: use --notes behavior for format.notes Denton Liu
2019-12-09 13:10 ` [PATCH 5/5] format-patch: move git_config() before repo_init_revisions() Denton Liu
2019-12-09 21:36 ` [PATCH 0/5] format-patch: improve handling of `format.notes` Junio C Hamano
2019-12-09 21:42 ` Elijah Newren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=cover.1575896661.git.liu.denton@gmail.com \
--to=liu.denton@gmail.com \
--cc=dev+git@drbeat.li \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=newren@gmail.com \
--cc=plroskin@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).