diff options
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/rebase.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/builtin/rebase.c b/builtin/rebase.c index b5c99ec10c..f9f231a5f0 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -793,6 +793,19 @@ static void set_reflog_action(struct rebase_options *options) strbuf_release(&buf); } +static int check_exec_cmd(const char *cmd) +{ + if (strchr(cmd, '\n')) + return error(_("exec commands cannot contain newlines")); + + /* Does the command consist purely of whitespace? */ + if (!cmd[strspn(cmd, " \t\r\f\v")]) + return error(_("empty exec command")); + + return 0; +} + + int cmd_rebase(int argc, const char **argv, const char *prefix) { struct rebase_options options = { @@ -1130,6 +1143,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"); |