From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Phillip Wood <phillip.wood@dunelm.org.uk>
Cc: Git Mailing List <git@vger.kernel.org>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH] rebase -x: sanity check command
Date: Tue, 29 Jan 2019 16:32:45 +0100 (STD) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.1901291632070.41@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <13f14cc6-e437-3f18-7f24-1d6edda1cb23@talktalk.net>
Hi Phillip,
[sorry for the double-send, I dropped the Cc: list by mistake the first
time I replied]
On Tue, 29 Jan 2019, Phillip Wood wrote:
> On 28/01/2019 22:03, Johannes Schindelin wrote:
> > Hi Phillip,
> >
> > On Mon, 28 Jan 2019, Phillip Wood wrote:
> >
> >> From: Phillip Wood <phillip.wood@dunelm.org.uk>
> >>
> >> If the user gives an empty argument to --exec then 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'.
> >
> > And that's the same if you specify an incorrect command.
>
> Not quite, the issue is that the todo list is invalid, not that the
> command fails - it never gets that far. Those errors are coming from
> parse_insn_line() and parse_insn_buffer().
Ah! I misunderstood "then the rebase starts to run" part.
So please let me withdraw my objections to catch this error.
However, I still would highly recommend to use `strspn()` to simplify the
code.
Thanks,
Dscho
> > In both cases, I would probably heed the second line of the advice: 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.
> >
> > This, however, makes a ton of sense to me.
> >
> >> diff --git a/builtin/rebase.c b/builtin/rebase.c
> >> index 00de70365e..b6c54b03c1 100644
> >> --- a/builtin/rebase.c
> >> +++ b/builtin/rebase.c
> >> @@ -793,6 +793,24 @@ static void set_reflog_action(struct rebase_options *options)
> >> strbuf_release(&buf);
> >> }
> >>
> >> +static int check_exec_cmd(const char *cmd)
> >> +{
> >> + int non_blank = 0;
> >> +
> >> + while (*cmd) {
> >> + if (*cmd == '\n')
> >> + return error(_("exec commands cannot contain newlines"));
> >> + if (!isspace(*cmd))
> >> + non_blank = 1;
> >> + cmd++;
> >> + }
> >> +
> >> + if (non_blank)
> >> + return 0;
> >
> > We are not in a performance critical path here, so I would prefer the
> > readability of this code:
> >
> > if (strchr(cmd, '\n'))
> > return error(...);
> >
> > And if you *really* must,
> >
> > /* Does the command consist purely of whitespace? */
> > if (!cmd[strspn(cmd, " \t\r\n")])
> > return error(...);
> >
> > But as I suggested also in a reply to Junio's answer: where would we stop
> > to validate the commands?
>
> I'm not trying to validate the command (and I don't think we can/should)
> - just generate a todo list that can be parsed.
>
> Best Wishes
>
> Phillip
>
> >
> > Ciao,
> > Dscho
> >
> >> +
> >> + return error(_("empty exec command"));
> >> +}
> >> +
> >> int cmd_rebase(int argc, const char **argv, const char *prefix)
> >> {
> >> struct rebase_options options = {
> >> @@ -1130,6 +1148,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" &&
> >> --
> >> 2.20.1
> >>
> >>
>
>
next prev parent reply other threads:[~2019-01-29 15:33 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 [this message]
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
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=nycvar.QRO.7.76.6.1901291632070.41@tvgsbejvaqbjf.bet \
--to=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).