From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: Phillip Wood <phillip.wood@dunelm.org.uk>
Cc: Git Mailing List <git@vger.kernel.org>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH v2] rebase -x: sanity check command
Date: Wed, 13 Feb 2019 14:31:24 +0100 [thread overview]
Message-ID: <87ftsrke6r.fsf@evledraar.gmail.com> (raw)
In-Reply-To: <20190129184327.30391-1-phillip.wood@talktalk.net>
On Tue, Jan 29 2019, Phillip Wood wrote:
> From: Phillip Wood <phillip.wood@dunelm.org.uk>
>
> If the user gives an empty argument to --exec then git creates a todo
> list that it cannot parse. The rebase starts to run before erroring out
> with
>
> error: missing arguments for exec
> error: invalid line 2: exec
> You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.
> Or you can abort the rebase with 'git rebase --abort'.
>
> Instead check for empty commands before starting the rebase.
>
> Also check that the command does not contain any newlines as the
> todo-list format is unable to cope with multiline commands. Note that
> this changes the behavior, before this change one could do
>
> git rebase --exec='echo one
> exec echo two'
>
> and it would insert two exec lines in the todo list, now it will error
> out.
>
> Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
> ---
>
> Apologies for the resend but I messed up the from address on the
> previous send and I don't think it made it to the mailing list.
>
> Thanks for the comments. I've updated the code as suggested by Dscho
> and tried to make it clearer in the commit message that this is fixing
> git creating a todo-list that it cannot parse.
>
> Range-diff against v1:
> 1: 9626549aec ! 1: 726b84c300 rebase -x: sanity check command
> @@ -2,8 +2,9 @@
>
> rebase -x: sanity check command
>
> - If the user gives an empty argument to --exec then the rebase starts to
> - run before erroring out with
> + If the user gives an empty argument to --exec then git creates a todo
> + list that it cannot parse. The rebase starts to run before erroring out
> + with
>
> error: missing arguments for exec
> error: invalid line 2: exec
> @@ -33,21 +34,16 @@
>
> +static int check_exec_cmd(const char *cmd)
> +{
> -+ int non_blank = 0;
> ++ if (strchr(cmd, '\n'))
> ++ return error(_("exec commands cannot contain newlines"));
> +
> -+ while (*cmd) {
> -+ if (*cmd == '\n')
> -+ return error(_("exec commands cannot contain newlines"));
> -+ if (!isspace(*cmd))
> -+ non_blank = 1;
> -+ cmd++;
> -+ }
> ++ /* Does the command consist purely of whitespace? */
> ++ if (!cmd[strspn(cmd, " \t\r\f\v")])
> ++ return error(_("empty exec command"));
> +
> -+ if (non_blank)
> -+ return 0;
> -+
> -+ return error(_("empty exec command"));
> ++ return 0;
> +}
> ++
> +
> int cmd_rebase(int argc, const char **argv, const char *prefix)
> {
>
> builtin/rebase.c | 17 +++++++++++++++++
> t/t3404-rebase-interactive.sh | 19 +++++++++++++++++++
> 2 files changed, 36 insertions(+)
>
> diff --git a/builtin/rebase.c b/builtin/rebase.c
> index 00de70365e..f75bd79b45 100644
> --- a/builtin/rebase.c
> +++ b/builtin/rebase.c
> @@ -793,6 +793,19 @@ static void set_reflog_action(struct rebase_options *options)
> strbuf_release(&buf);
> }
>
> +static int check_exec_cmd(const char *cmd)
> +{
> + if (strchr(cmd, '\n'))
> + return error(_("exec commands cannot contain newlines"));
> +
> + /* Does the command consist purely of whitespace? */
> + if (!cmd[strspn(cmd, " \t\r\f\v")])
> + return error(_("empty exec command"));
> +
> + return 0;
> +}
> +
> +
> int cmd_rebase(int argc, const char **argv, const char *prefix)
> {
> struct rebase_options options = {
> @@ -1130,6 +1143,10 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
> }
> }
>
> + for (i = 0; i < exec.nr; i++)
> + if (check_exec_cmd(exec.items[i].string))
> + exit(1);
> +
> if (!(options.flags & REBASE_NO_QUIET))
> argv_array_push(&options.git_am_opts, "-q");
>
> diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
> index 7a440e08d8..c98f64eb2d 100755
> --- a/t/t3404-rebase-interactive.sh
> +++ b/t/t3404-rebase-interactive.sh
> @@ -147,6 +147,25 @@ test_expect_success 'rebase -i with the exec command checks tree cleanness' '
> git rebase --continue
> '
>
> +test_expect_success 'rebase -x with empty command fails' '
> + test_when_finished "git rebase --abort ||:" &&
> + test_must_fail git rebase -x "" @ 2>actual &&
> + test_write_lines "error: empty exec command" >expected &&
> + test_i18ncmp expected actual &&
> + test_must_fail git rebase -x " " @ 2>actual &&
> + test_i18ncmp expected actual
> +'
> +
> +LF='
> +'
> +test_expect_success 'rebase -x with newline in command fails' '
> + test_when_finished "git rebase --abort ||:" &&
> + test_must_fail git rebase -x "a${LF}b" @ 2>actual &&
> + test_write_lines "error: exec commands cannot contain newlines" \
> + >expected &&
> + test_i18ncmp expected actual
> +'
> +
> test_expect_success 'rebase -i with exec of inexistent command' '
> git checkout master &&
> test_when_finished "git rebase --abort" &&
This patch breaks the test suite (with these two new tests) under
GIT_TEST_REBASE_USE_BUILTIN=false. So a 2.21.0-rc0 regression.
It would have been better to raise this before the rc period, but I just
noticed this now, but we can now:
1. Skip the test under that mode
2. Fix the shell code to do the same thing
3. Just remove the shell code & GIT_TEST_REBASE_USE_BUILTIN=false mode
Maybe we should just do #3. The reason for the escape hatch was in case
we had bugs, and now we've had a full release cycle, but maybe that's
too early...
next prev parent reply other threads:[~2019-02-13 13:31 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-28 10:26 [PATCH] rebase -x: sanity check command Phillip Wood
2019-01-28 18:23 ` Junio C Hamano
2019-01-28 21:56 ` Johannes Schindelin
2019-01-29 11:40 ` Phillip Wood
2019-01-29 15:35 ` Johannes Schindelin
2019-01-28 22:03 ` Johannes Schindelin
2019-01-29 11:34 ` Phillip Wood
2019-01-29 15:32 ` Johannes Schindelin
2019-01-29 18:43 ` [PATCH v2] " Phillip Wood
2019-01-29 21:53 ` Junio C Hamano
2019-01-30 12:25 ` Johannes Schindelin
2019-02-13 13:31 ` Ævar Arnfjörð Bjarmason [this message]
2019-02-13 14:22 ` [PATCH] rebase: remove the rebase.useBuiltin setting Ævar Arnfjörð Bjarmason
2019-02-13 16:25 ` Johannes Schindelin
2019-02-13 20:46 ` Junio C Hamano
2019-02-13 21:49 ` [PATCH] rebase: fix regression in rebase.useBuiltin=false test mode Ævar Arnfjörð Bjarmason
2019-02-13 23:21 ` Junio C Hamano
2019-02-14 16:12 ` Phillip Wood
2019-03-14 13:24 ` [PATCH v2] rebase: remove the rebase.useBuiltin setting Ævar Arnfjörð Bjarmason
2019-03-14 14:58 ` Johannes Schindelin
2019-03-14 15:27 ` Ævar Arnfjörð Bjarmason
2019-03-15 13:45 ` [PATCH v3] " Ævar Arnfjörð Bjarmason
2019-03-15 15:44 ` Johannes Schindelin
2019-03-15 16:11 ` Ævar Arnfjörð Bjarmason
2019-03-18 6:06 ` Junio C Hamano
2019-03-18 10:19 ` Phillip Wood
2019-03-18 11:01 ` [PATCH v4] " Ævar Arnfjörð Bjarmason
2019-03-19 10:21 ` Phillip Wood
2021-03-23 15:23 ` [PATCH] rebase: remove transitory rebase.useBuiltin setting & env Ævar Arnfjörð Bjarmason
2021-03-23 20:42 ` Junio C Hamano
2021-03-23 20:52 ` Johannes Schindelin
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=87ftsrke6r.fsf@evledraar.gmail.com \
--to=avarab@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=phillip.wood@dunelm.org.uk \
/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).