mirror of
https://github.com/git/git
synced 2024-07-17 11:07:55 +00:00
0f57f731ea
The sequencer infrastructure is shared across "git cherry-pick", "git rebase -i", etc., and has always spawned "git commit" when it needs to create a commit. It has been taught to do so internally, when able, by reusing the codepath "git commit" itself uses, which gives performance boost for a few tens of percents in some sample scenarios. * pw/sequencer-in-process-commit: sequencer: run 'prepare-commit-msg' hook t7505: add tests for cherry-pick and rebase -i/-p t7505: style fixes sequencer: assign only free()able strings to gpg_sign sequencer: improve config handling t3512/t3513: remove KNOWN_FAILURE_CHERRY_PICK_SEES_EMPTY_COMMIT=1 sequencer: try to commit without forking 'git commit' sequencer: load commit related config sequencer: simplify adding Signed-off-by: trailer commit: move print_commit_summary() to libgit commit: move post-rewrite code to libgit Add a function to update HEAD after creating a commit commit: move empty message checks to libgit t3404: check intermediate squash messages
78 lines
2.8 KiB
C
78 lines
2.8 KiB
C
#include "builtin.h"
|
|
#include "cache.h"
|
|
#include "config.h"
|
|
#include "parse-options.h"
|
|
#include "sequencer.h"
|
|
|
|
static const char * const builtin_rebase_helper_usage[] = {
|
|
N_("git rebase--helper [<options>]"),
|
|
NULL
|
|
};
|
|
|
|
int cmd_rebase__helper(int argc, const char **argv, const char *prefix)
|
|
{
|
|
struct replay_opts opts = REPLAY_OPTS_INIT;
|
|
unsigned flags = 0, keep_empty = 0;
|
|
int abbreviate_commands = 0;
|
|
enum {
|
|
CONTINUE = 1, ABORT, MAKE_SCRIPT, SHORTEN_OIDS, EXPAND_OIDS,
|
|
CHECK_TODO_LIST, SKIP_UNNECESSARY_PICKS, REARRANGE_SQUASH,
|
|
ADD_EXEC
|
|
} command = 0;
|
|
struct option options[] = {
|
|
OPT_BOOL(0, "ff", &opts.allow_ff, N_("allow fast-forward")),
|
|
OPT_BOOL(0, "keep-empty", &keep_empty, N_("keep empty commits")),
|
|
OPT_CMDMODE(0, "continue", &command, N_("continue rebase"),
|
|
CONTINUE),
|
|
OPT_CMDMODE(0, "abort", &command, N_("abort rebase"),
|
|
ABORT),
|
|
OPT_CMDMODE(0, "make-script", &command,
|
|
N_("make rebase script"), MAKE_SCRIPT),
|
|
OPT_CMDMODE(0, "shorten-ids", &command,
|
|
N_("shorten commit ids in the todo list"), SHORTEN_OIDS),
|
|
OPT_CMDMODE(0, "expand-ids", &command,
|
|
N_("expand commit ids in the todo list"), EXPAND_OIDS),
|
|
OPT_CMDMODE(0, "check-todo-list", &command,
|
|
N_("check the todo list"), CHECK_TODO_LIST),
|
|
OPT_CMDMODE(0, "skip-unnecessary-picks", &command,
|
|
N_("skip unnecessary picks"), SKIP_UNNECESSARY_PICKS),
|
|
OPT_CMDMODE(0, "rearrange-squash", &command,
|
|
N_("rearrange fixup/squash lines"), REARRANGE_SQUASH),
|
|
OPT_CMDMODE(0, "add-exec-commands", &command,
|
|
N_("insert exec commands in todo list"), ADD_EXEC),
|
|
OPT_END()
|
|
};
|
|
|
|
sequencer_init_config(&opts);
|
|
git_config_get_bool("rebase.abbreviatecommands", &abbreviate_commands);
|
|
|
|
opts.action = REPLAY_INTERACTIVE_REBASE;
|
|
opts.allow_ff = 1;
|
|
opts.allow_empty = 1;
|
|
|
|
argc = parse_options(argc, argv, NULL, options,
|
|
builtin_rebase_helper_usage, PARSE_OPT_KEEP_ARGV0);
|
|
|
|
flags |= keep_empty ? TODO_LIST_KEEP_EMPTY : 0;
|
|
flags |= abbreviate_commands ? TODO_LIST_ABBREVIATE_CMDS : 0;
|
|
flags |= command == SHORTEN_OIDS ? TODO_LIST_SHORTEN_IDS : 0;
|
|
|
|
if (command == CONTINUE && argc == 1)
|
|
return !!sequencer_continue(&opts);
|
|
if (command == ABORT && argc == 1)
|
|
return !!sequencer_remove_state(&opts);
|
|
if (command == MAKE_SCRIPT && argc > 1)
|
|
return !!sequencer_make_script(stdout, argc, argv, flags);
|
|
if ((command == SHORTEN_OIDS || command == EXPAND_OIDS) && argc == 1)
|
|
return !!transform_todos(flags);
|
|
if (command == CHECK_TODO_LIST && argc == 1)
|
|
return !!check_todo_list();
|
|
if (command == SKIP_UNNECESSARY_PICKS && argc == 1)
|
|
return !!skip_unnecessary_picks();
|
|
if (command == REARRANGE_SQUASH && argc == 1)
|
|
return !!rearrange_squash();
|
|
if (command == ADD_EXEC && argc == 2)
|
|
return !!sequencer_add_exec_commands(argv[1]);
|
|
usage_with_options(builtin_rebase_helper_usage, options);
|
|
}
|