From: Junio C Hamano <gitster@pobox.com>
To: Denton Liu <liu.denton@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH 2/2] format-patch: teach format.notes config option
Date: Tue, 07 May 2019 13:43:59 +0900 [thread overview]
Message-ID: <xmqqlfzinab4.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <1338045be4a185cddc3ebf8adbe4b744551acf15.1556388260.git.liu.denton@gmail.com> (Denton Liu's message of "Sat, 27 Apr 2019 15:25:25 -0400")
Denton Liu <liu.denton@gmail.com> writes:
> In git-format-patch, notes can be appended with the `--notes` option.
> However, this must be specified by the user on an
> invocation-by-invocation basis. If a user is not careful, it's possible
> that they may forget to include it and generate a patch series without
> notes.
>
> Teach git-format-patch the `format.notes` config option where if its
> value is true, notes will automatically be appended. This option is
> overridable with the `--no-notes` option in case a user wishes not to
> append notes.
>
> Signed-off-by: Denton Liu <liu.denton@gmail.com>
> ---
> Documentation/config/format.txt | 4 ++++
> Documentation/git-format-patch.txt | 3 +++
> builtin/log.c | 6 ++++++
> t/t4014-format-patch.sh | 28 ++++++++++++++++++++++++++++
> 4 files changed, 41 insertions(+)
>
> diff --git a/Documentation/config/format.txt b/Documentation/config/format.txt
> index dc77941c48..55327b6511 100644
> --- a/Documentation/config/format.txt
> +++ b/Documentation/config/format.txt
> @@ -85,3 +85,7 @@ format.outputDirectory::
> format.useAutoBase::
> A boolean value which lets you enable the `--base=auto` option of
> format-patch by default.
> +
> +format.notes::
> + A boolean value which lets you enable the `--notes` option of
> + format-patch by default.
Whoa. Why should this be a boolean?
I think I can do
git format-patch --notes=amlog master..
and was hoping that this can be used to configure the option out of
my command line typing.
> diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh
> index b6e2fdbc44..fe9522121a 100755
> --- a/t/t4014-format-patch.sh
> +++ b/t/t4014-format-patch.sh
> @@ -738,6 +738,34 @@ test_expect_success 'format-patch --notes --signoff' '
> sed "1,/^---$/d" out | grep "test message"
> '
And if you look at the existing test above this, you'd notice that
the command is tested is in "format-patch --notes=test" form. We
should make sure that the same is done with the config in the new
test, too.
> +test_expect_success 'format-patch notes output control' '
> + git notes add -m "notes config message" HEAD &&
> + test_when_finished git notes remove HEAD &&
> +
> + git format-patch -1 --stdout >out &&
> + ! grep "notes config message" out &&
> + git format-patch -1 --stdout --notes >out &&
> + grep "notes config message" out &&
> + git format-patch -1 --stdout --no-notes >out &&
> + ! grep "notes config message" out &&
> + git format-patch -1 --stdout --notes --no-notes >out &&
> + ! grep "notes config message" out &&
> + git format-patch -1 --stdout --no-notes --notes >out &&
> + grep "notes config message" out &&
> +
> + test_config format.notes true &&
> + git format-patch -1 --stdout >out &&
> + grep "notes config message" out &&
> + git format-patch -1 --stdout --notes >out &&
> + grep "notes config message" out &&
> + git format-patch -1 --stdout --no-notes >out &&
> + ! grep "notes config message" out &&
> + git format-patch -1 --stdout --notes --no-notes >out &&
> + ! grep "notes config message" out &&
> + git format-patch -1 --stdout --no-notes --notes >out &&
> + grep "notes config message" out
> +'
> +
> echo "fatal: --name-only does not make sense" > expect.name-only
> echo "fatal: --name-status does not make sense" > expect.name-status
> echo "fatal: --check does not make sense" > expect.check
next prev parent reply other threads:[~2019-05-07 4:44 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-27 19:25 [PATCH 0/2] format-patch: teach format.notes config option Denton Liu
2019-04-27 19:25 ` [PATCH 1/2] git-format-patch.txt: document --no-notes option Denton Liu
2019-04-27 19:25 ` [PATCH 2/2] format-patch: teach format.notes config option Denton Liu
2019-05-07 4:43 ` Junio C Hamano [this message]
2019-05-08 15:02 ` [PATCH v2 0/2] " Denton Liu
2019-05-08 15:02 ` [PATCH v2 1/2] git-format-patch.txt: document --no-notes option Denton Liu
2019-05-08 15:02 ` [PATCH v2 2/2] format-patch: teach format.notes config option Denton Liu
2019-05-08 17:18 ` Beat Bolli
2019-05-08 17:31 ` Denton Liu
2019-05-08 17:52 ` Beat Bolli
2019-05-10 18:37 ` [PATCH v3 0/2] " Denton Liu
2019-05-10 18:37 ` [PATCH v3 1/2] git-format-patch.txt: document --no-notes option Denton Liu
2019-05-10 18:37 ` [PATCH v3 2/2] format-patch: teach format.notes config option Denton Liu
2019-05-13 2:44 ` Junio C Hamano
2019-05-14 17:01 ` Denton Liu
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=xmqqlfzinab4.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=liu.denton@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).