diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2019-07-24 21:15:00 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-07-25 15:58:13 (GMT) |
| commit | 80dfc9242ebaba357ffedececd88641a1a752411 (patch) | |
| tree | 74a4b5d62c16e70f1ba834017a35db7f9f93f6a7 | |
| parent | cbea64615301e7dea0cd756cf0245653ecbf6edc (diff) | |
| download | git-80dfc9242ebaba357ffedececd88641a1a752411.zip git-80dfc9242ebaba357ffedececd88641a1a752411.tar.gz git-80dfc9242ebaba357ffedececd88641a1a752411.tar.bz2 | |
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>
| -rw-r--r-- | builtin/rebase.c | 4 | ||||
| -rw-r--r-- | git.c | 7 |
2 files changed, 1 insertions, 10 deletions
diff --git a/builtin/rebase.c b/builtin/rebase.c index 2f9041f..21681a5 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -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); @@ -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 }, |