From 80dfc9242ebaba357ffedececd88641a1a752411 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Wed, 24 Jul 2019 14:15:00 -0700 Subject: 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 Signed-off-by: Junio C Hamano --- git.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'git.c') diff --git a/git.c b/git.c index 1bf9c94550..1461e819c3 100644 --- a/git.c +++ b/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 }, -- cgit v1.2.3