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 v2] rebase -x: sanity check command
Date: Wed, 30 Jan 2019 13:25:53 +0100 (STD) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.1901301325370.41@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <20190129184327.30391-1-phillip.wood@talktalk.net>
Hi Phillip,
On Tue, 29 Jan 2019, Phillip Wood wrote:
> 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)
> {
Looks great!
Thanks,
Dscho
next prev parent reply other threads:[~2019-01-30 12:26 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 [this message]
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.1901301325370.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).