diff options
author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2019-07-24 14:15:00 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-07-25 08:58:13 -0700 |
commit | 80dfc9242ebaba357ffedececd88641a1a752411 (patch) | |
tree | 74a4b5d62c16e70f1ba834017a35db7f9f93f6a7 /builtin | |
parent | rebase: fix white-space (diff) | |
download | tgif-80dfc9242ebaba357ffedececd88641a1a752411.tar.xz |
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>
Diffstat (limited to 'builtin')
-rw-r--r-- | builtin/rebase.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/builtin/rebase.c b/builtin/rebase.c index 2f9041fce2..21681a551b 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); |