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>
Johannes Schindelin committed
Jul 24, 2019 at 14:15 UTC
80dfc9242ebaba357ffedececd88641a1a752411
2 files changed
+1
-10
builtin/rebase.c
-4
@@ -1486,10 +1486,6 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
1486
usage_with_options(builtin_rebase_usage,
1487
builtin_rebase_options);
1488
1489
- prefix = setup_git_directory();
1490
- trace_repo_setup(prefix);
1491
- setup_work_tree();
1492
-
1489
options.allow_empty_message = 1;
1490
git_config(rebase_config, &options);
1491
git.c
+1
-6
@@ -549,12 +549,7 @@ static struct cmd_struct commands[] = {
549
{ "push", cmd_push, RUN_SETUP },
550
{ "range-diff", cmd_range_diff, RUN_SETUP | USE_PAGER },
551
{ "read-tree", cmd_read_tree, RUN_SETUP | SUPPORT_SUPER_PREFIX},
552
- /*
553
- * NEEDSWORK: Until the rebase is independent and needs no redirection
554
- * to rebase shell script this is kept as is, then should be changed to
555
- * RUN_SETUP | NEED_WORK_TREE
556
- */
557
- { "rebase", cmd_rebase },
552
+ { "rebase", cmd_rebase, RUN_SETUP | NEED_WORK_TREE },
553
{ "rebase--interactive", cmd_rebase__interactive, RUN_SETUP | NEED_WORK_TREE },
554
{ "receive-pack", cmd_receive_pack },
555
{ "reflog", cmd_reflog, RUN_SETUP },