diff options
author | Phillip Wood <phillip.wood@dunelm.org.uk> | 2019-01-29 21:43:27 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-01-30 00:34:51 +0300 |
commit | c762aada1ab3a2c428c462e0e6964d9f37107da7 (patch) | |
tree | bbebee0fe64928af8bf20968abec2bbb32ecc016 /object-store.h | |
parent | 0d0ac3826a3bbb9247e39e12623bbcfdd722f24c (diff) |
rebase -x: sanity check command
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'object-store.h')
0 files changed, 0 insertions, 0 deletions