mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
builtin rebase: support --exec
This commit adds support for the `--exec` option which takes a shell command-line as argument. This argument will be appended as an `exec <cmd>` command after each line in the todo list that creates a commit in the final history. commands. Note: while the shell script version of `git rebase` assigned the empty string to `cmd` by default, we *unset* it here because the code looks nicer and it does not change the behavior. The `--exec` option requires `--interactive` machinery. Signed-off-by: Pratik Karki <predatoramigo@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
6defce2b02
commit
68e46d7868
|
@ -93,6 +93,7 @@ struct rebase_options {
|
|||
int autosquash;
|
||||
char *gpg_sign_opt;
|
||||
int autostash;
|
||||
char *cmd;
|
||||
};
|
||||
|
||||
static int is_interactive(struct rebase_options *opts)
|
||||
|
@ -346,6 +347,7 @@ static int run_specific_rebase(struct rebase_options *opts)
|
|||
add_var(&script_snippet, "keep_empty", opts->keep_empty ? "yes" : "");
|
||||
add_var(&script_snippet, "autosquash", opts->autosquash ? "t" : "");
|
||||
add_var(&script_snippet, "gpg_sign_opt", opts->gpg_sign_opt);
|
||||
add_var(&script_snippet, "cmd", opts->cmd);
|
||||
|
||||
switch (opts->type) {
|
||||
case REBASE_AM:
|
||||
|
@ -619,6 +621,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
|
|||
const char *gpg_sign = NULL;
|
||||
int opt_c = -1;
|
||||
struct string_list whitespace = STRING_LIST_INIT_NODUP;
|
||||
struct string_list exec = STRING_LIST_INIT_NODUP;
|
||||
struct option builtin_rebase_options[] = {
|
||||
OPT_STRING(0, "onto", &options.onto_name,
|
||||
N_("revision"),
|
||||
|
@ -692,6 +695,9 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
|
|||
REBASE_AM),
|
||||
OPT_BOOL(0, "autostash", &options.autostash,
|
||||
N_("automatically stash/stash pop before and after")),
|
||||
OPT_STRING_LIST('x', "exec", &exec, N_("exec"),
|
||||
N_("add exec lines after each commit of the "
|
||||
"editable list")),
|
||||
OPT_END(),
|
||||
};
|
||||
|
||||
|
@ -916,6 +922,17 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
|
|||
}
|
||||
}
|
||||
|
||||
if (exec.nr) {
|
||||
int i;
|
||||
|
||||
imply_interactive(&options, "--exec");
|
||||
|
||||
strbuf_reset(&buf);
|
||||
for (i = 0; i < exec.nr; i++)
|
||||
strbuf_addf(&buf, "exec %s\n", exec.items[i].string);
|
||||
options.cmd = xstrdup(buf.buf);
|
||||
}
|
||||
|
||||
switch (options.type) {
|
||||
case REBASE_MERGE:
|
||||
case REBASE_INTERACTIVE:
|
||||
|
@ -1198,5 +1215,6 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
|
|||
strbuf_release(&revisions);
|
||||
free(options.head_name);
|
||||
free(options.gpg_sign_opt);
|
||||
free(options.cmd);
|
||||
return ret;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue