mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git: mark cmd_rebase as requiring a worktree

Browse Source 
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:
Johannes Schindelin
2019-07-24 14:15:00 -07:00
committed by Junio C Hamano
parent cbea646153
commit 80dfc9242e
2 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
git.c
View File

@ -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 },