From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Phillip Wood <phillip.wood@dunelm.org.uk>
Cc: Junio C Hamano <gitster@pobox.com>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH] rebase -x: sanity check command
Date: Tue, 29 Jan 2019 16:35:37 +0100 (STD) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.1901291633440.41@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <4e4e46b3-9745-a3db-56cb-58763f7cf994@talktalk.net>
Hi Phillip,
On Tue, 29 Jan 2019, Phillip Wood wrote:
> On 28/01/2019 21:56, Johannes Schindelin wrote:
> >
> > On Mon, 28 Jan 2019, Junio C Hamano wrote:
> >
> >> Phillip Wood <phillip.wood@talktalk.net> writes:
> >>
> >>> 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'.
> >>
> >> Hmph. I do agree that the above makes an unfortunate end-user
> >> experience, but I would sort-of imagine that it would even be nicer
> >> for such an empty exec to behave as if it were "exec false" but with
> >> less severe error message, i.e. a way for the user to say "I want to
> >> break the sequence here and get an interactive session". We may not
> >> even need to add the "break" insn if we go that way and there is one
> >> less thing for users to learn. I dunno, but I tend to prefer giving
> >> a useful and safe behaviour to interactive users other than erroring
> >> out, when there _is_ such a safe behaviour that is obvious from the
> >> situation, and I feel that an empty "exec" is such a case.
> >
> > That would make things unnecessarily confusing. An empty command is not
> > `false` with a gentler error message. An empty command is a missing
> > command.
>
> I agree that having a special meaning to the empty command would be
> confusing. Also giving it on the command line only helps if you want to
> stop after each pick and my impression is that people want to break
> after specific commits to amend a fixup or something like that.
>
> > I am, however, concerned that special-casing an empty command will not
> > make things better: if the user called `git rebase --exec=fasle`, they
> > will *still* have to clean up their edit script.
>
> The empty commands create an invalid todo list which git cannot parse,
> this patch is not a step down the path of checking that the command
> exists or is valid shell - I don't think that would be possible in the
> general case.
Well, at least the error message is helpful: it suggests --edit-todo.
But as I said in another reply, I understand now that your patch validates
the argument as necessary to produce a valid todo list.
Thanks,
Dscho
>
> Best Wishes
>
> Phillip
>
> > Or just `git rebase --abort`, which I would do whether I had forgotten to
> > specify a command or whether I had a typo in my command.
> >
> >>> 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'
> >>
> >> It is very good to check the input, regardless of what an empty
> >> "exec" should do.
> >
> > Should we then also check for incorrect quoting, missing commands, other
> > errors? I am not sure that this path leads to sanity.
> >
> > Ciao,
> > Dscho
> >
>
>
next prev parent reply other threads:[~2019-01-29 15:36 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 [this message]
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
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.1901291633440.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).