From: Phillip Wood <phillip.wood123@gmail.com>
To: Eric Sunshine <sunshine@sunshineco.com>,
Phillip Wood via GitGitGadget <gitgitgadget@gmail.com>
Cc: Git List <git@vger.kernel.org>,
Phillip Wood <phillip.wood@dunelm.org.uk>
Subject: Re: [PATCH 3/3] commit: add an option the reword HEAD
Date: Mon, 21 Sep 2020 19:05:08 +0100 [thread overview]
Message-ID: <6da3752f-5e45-1381-b54c-64a81d642b72@gmail.com> (raw)
In-Reply-To: <CAPig+cQNiB8nw-JwwFweHzeFYcozGA06pPKr=0N9Metp8PBbSQ@mail.gmail.com>
Hi Eric
On 21/09/2020 16:43, Eric Sunshine wrote:
> On Mon, Sep 21, 2020 at 9:31 AM Phillip Wood via GitGitGadget
> <gitgitgadget@gmail.com> wrote:
>> +--reword::
>> + Reword the commit message of the tip of the current branch by
>> + replacing it with a new commit. The commit contents will be
>> + unchanged even if there are staged changes. This is equivalent
>> + to specifying `--amend --only --allow-empty` with no paths.
>> diff --git a/builtin/commit.c b/builtin/commit.c
>> @@ -1152,6 +1153,41 @@ static void finalize_deferred_config(struct wt_status *s)
>> +static void validate_reword_options(int argc, struct commit *current_head)
>> +{
>> + if (amend)
>> + die(_("cannot combine --reword with --amend"));
>> + if (only)
>> + die(_("cannot combine --reword with --only"));
>
> Nit: It feels a bit odd (though not outright wrong) to disallow
> --reword in combination with --amend and --only after the
> documentation states that --reword is equivalent to using those
> options.
Yeah I decided to be quite strict, I'm in two minds about the
documentation, I think it might be better to remove that line.
>> diff --git a/t/t7501-commit-basic-functionality.sh b/t/t7501-commit-basic-functionality.sh
>> @@ -713,4 +713,60 @@ test_expect_success '--dry-run --short' '
>> +test_reword_opt () {
>> + test_expect_success C_LOCALE_OUTPUT "--reword incompatible with $1" "
>> + echo 'fatal: cannot combine --reword with $1' >expect &&
>> + test_must_fail git commit --reword $1 2>actual &&
>> + test_cmp expect actual
>> + "
>> +}
>
> These error messages are subject to localization, so you'd want to use
> test_i18ncmp() here, I think.
>
> Same comment for other new tests.
I decided to use the C_LOCALE_OUTPUT prerequisite and test_cmp rather
than grep so I could check the exact output. I'm slightly suspicious of
tests that just grep for an error message when that is all we should be
showing. I should probably check that nothing is printed to stdout in
these tests
Best Wishes
Phillip
next prev parent reply other threads:[~2020-09-21 18:05 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-21 13:30 [PATCH 0/3] commit: add an option to reword the last commit Phillip Wood via GitGitGadget
2020-09-21 13:30 ` [PATCH 1/3] commit docs: use backquotes when quoting options Phillip Wood via GitGitGadget
2020-09-21 13:30 ` [PATCH 2/3] commit: reorder synopsis Phillip Wood via GitGitGadget
2020-09-22 5:27 ` Junio C Hamano
2020-09-22 13:27 ` Phillip Wood
2020-09-22 16:16 ` Junio C Hamano
2020-09-21 13:30 ` [PATCH 3/3] commit: add an option the reword HEAD Phillip Wood via GitGitGadget
2020-09-21 15:43 ` Eric Sunshine
2020-09-21 18:05 ` Phillip Wood [this message]
2020-09-21 18:12 ` Eric Sunshine
2020-09-21 19:27 ` Junio C Hamano
2020-09-22 13:38 ` Phillip Wood
2020-09-22 16:54 ` Junio C Hamano
2020-09-21 17:04 ` Christian Couder
2020-09-21 18:01 ` Phillip Wood
2020-09-23 10:22 ` Johannes Schindelin
2020-09-23 18:23 ` Phillip Wood
2020-09-23 20:42 ` Johannes Schindelin
2020-09-24 9:58 ` Phillip Wood
2020-09-24 16:58 ` Junio C Hamano
2020-09-21 16:15 ` [PATCH 0/3] commit: add an option to reword the last commit Junio C Hamano
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=6da3752f-5e45-1381-b54c-64a81d642b72@gmail.com \
--to=phillip.wood123@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=phillip.wood@dunelm.org.uk \
--cc=sunshine@sunshineco.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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.