git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] rebase -x: sanity check command

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Jan 29, 2019, 15:35 UTC
Message-ID
<nycvar.QRO.7.76.6.1901291633440.41@tvgsbejvaqbjf.bet>
In-Reply-To
<4e4e46b3-9745-a3db-56cb-58763f7cf994@talktalk.net>
Hi Phillip,
On Tue, 29 Jan 2019, Phillip Wood wrote:
Show 44 quoted lines
> 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

Show 26 quoted lines
> 
> 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
> > 
> 
> 
Previous: Phillip WoodNext: Johannes Schindelin
Message 5 of 31 in “rebase -x: sanity check command”
  1. rebase -x: sanity check commandPhillip Wood, Jan 28, 2019
  2. Junio C HamanoJan 28, 2019
  3. Johannes SchindelinJan 28, 2019
  4. Phillip WoodJan 29, 2019
  5. Johannes SchindelinJan 29, 2019
  6. Johannes SchindelinJan 28, 2019
  7. Phillip WoodJan 29, 2019
  8. Johannes SchindelinJan 29, 2019
  9. rebase -x: sanity check commandPhillip Wood, Jan 29, 2019
  10. Junio C HamanoJan 29, 2019
  11. Johannes SchindelinJan 30, 2019
  12. Ævar Arnfjörð BjarmasonFeb 13, 2019
  13. rebase: remove the rebase.useBuiltin settingÆvar Arnfjörð Bjarmason, Feb 13, 2019
  14. Johannes SchindelinFeb 13, 2019
  15. Junio C HamanoFeb 13, 2019
  16. rebase: fix regression in rebase.useBuiltin=false test modeÆvar Arnfjörð Bjarmason, Feb 13, 2019
  17. Junio C HamanoFeb 13, 2019
  18. Phillip WoodFeb 14, 2019
  19. rebase: remove the rebase.useBuiltin settingÆvar Arnfjörð Bjarmason, Mar 14, 2019
  20. Johannes SchindelinMar 14, 2019
  21. Ævar Arnfjörð BjarmasonMar 14, 2019
  22. rebase: remove the rebase.useBuiltin settingÆvar Arnfjörð Bjarmason, Mar 15, 2019
  23. Johannes SchindelinMar 15, 2019
  24. Ævar Arnfjörð BjarmasonMar 15, 2019
  25. Junio C HamanoMar 18, 2019
  26. Phillip WoodMar 18, 2019
  27. rebase: remove the rebase.useBuiltin settingÆvar Arnfjörð Bjarmason, Mar 18, 2019
  28. Phillip WoodMar 19, 2019
  29. rebase: remove transitory rebase.useBuiltin setting & envÆvar Arnfjörð Bjarmason, Mar 23, 2021
  30. Junio C HamanoMar 23, 2021
  31. Johannes SchindelinMar 23, 2021

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.