зеркало из https://github.com/microsoft/git.git
git: mark cmd_rebase as requiring a worktree
We skipped marking the "rebase" built-in as requiring a .git/ directory and a worktree only to allow to spawn the scripted version of `git rebase`. Now that we no longer have that escape hatch, we can change that to the canonical form. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
cbea646153
Коммит
80dfc9242e
|
@ -1486,10 +1486,6 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
|
|||
usage_with_options(builtin_rebase_usage,
|
||||
builtin_rebase_options);
|
||||
|
||||
prefix = setup_git_directory();
|
||||
trace_repo_setup(prefix);
|
||||
setup_work_tree();
|
||||
|
||||
options.allow_empty_message = 1;
|
||||
git_config(rebase_config, &options);
|
||||
|
||||
|
|
7
git.c
7
git.c
|
@ -549,12 +549,7 @@ static struct cmd_struct commands[] = {
|
|||
{ "push", cmd_push, RUN_SETUP },
|
||||
{ "range-diff", cmd_range_diff, RUN_SETUP | USE_PAGER },
|
||||
{ "read-tree", cmd_read_tree, RUN_SETUP | SUPPORT_SUPER_PREFIX},
|
||||
/*
|
||||
* NEEDSWORK: Until the rebase is independent and needs no redirection
|
||||
* to rebase shell script this is kept as is, then should be changed to
|
||||
* RUN_SETUP | NEED_WORK_TREE
|
||||
*/
|
||||
{ "rebase", cmd_rebase },
|
||||
{ "rebase", cmd_rebase, RUN_SETUP | NEED_WORK_TREE },
|
||||
{ "rebase--interactive", cmd_rebase__interactive, RUN_SETUP | NEED_WORK_TREE },
|
||||
{ "receive-pack", cmd_receive_pack },
|
||||
{ "reflog", cmd_reflog, RUN_SETUP },
|
||||
|
|
Загрузка…
Ссылка в новой задаче