* [PATCH 0/2] Clean up more of the fall-out from dropping the scripted git rebase
@ 2019-07-24 21:14 Johannes Schindelin via GitGitGadget
2019-07-24 21:14 ` [PATCH 1/2] rebase: fix white-space Johannes Schindelin via GitGitGadget
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Johannes Schindelin via GitGitGadget @ 2019-07-24 21:14 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano
I had prepared these patches even before v2.22.0, but deemed them not
critical enough to push into that release.
Johannes Schindelin (2):
rebase: fix white-space
git: mark cmd_rebase as requiring a worktree
builtin/rebase.c | 6 +-----
git.c | 7 +------
2 files changed, 2 insertions(+), 11 deletions(-)
base-commit: 082ef75b7bfc90ac236afbb857a9552a026832b8
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-293%2Fdscho%2Frebase-cleanup-more-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-293/dscho/rebase-cleanup-more-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/293
--
gitgitgadget
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/2] rebase: fix white-space
2019-07-24 21:14 [PATCH 0/2] Clean up more of the fall-out from dropping the scripted git rebase Johannes Schindelin via GitGitGadget
@ 2019-07-24 21:14 ` Johannes Schindelin via GitGitGadget
2019-07-24 21:15 ` [PATCH 2/2] git: mark cmd_rebase as requiring a worktree Johannes Schindelin via GitGitGadget
2019-07-25 15:56 ` [PATCH 0/2] Clean up more of the fall-out from dropping the scripted git rebase Junio C Hamano
2 siblings, 0 replies; 5+ messages in thread
From: Johannes Schindelin via GitGitGadget @ 2019-07-24 21:14 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano, Johannes Schindelin
From: Johannes Schindelin <johannes.schindelin@gmx.de>
This trailing space was inadvertently introduced in 9fbcc3d203 (Merge
branch 'js/rebase-orig-head-fix', 2019-03-20).
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
builtin/rebase.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/rebase.c b/builtin/rebase.c
index 9c52144fc4..798b9ae2d7 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -2104,7 +2104,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
strbuf_addf(&msg, "%s: checkout %s",
getenv(GIT_REFLOG_ACTION_ENVIRONMENT), options.onto_name);
if (reset_head(&options.onto->object.oid, "checkout", NULL,
- RESET_HEAD_DETACH | RESET_ORIG_HEAD |
+ RESET_HEAD_DETACH | RESET_ORIG_HEAD |
RESET_HEAD_RUN_POST_CHECKOUT_HOOK,
NULL, msg.buf))
die(_("Could not detach HEAD"));
--
gitgitgadget
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2] git: mark cmd_rebase as requiring a worktree
2019-07-24 21:14 [PATCH 0/2] Clean up more of the fall-out from dropping the scripted git rebase Johannes Schindelin via GitGitGadget
2019-07-24 21:14 ` [PATCH 1/2] rebase: fix white-space Johannes Schindelin via GitGitGadget
@ 2019-07-24 21:15 ` Johannes Schindelin via GitGitGadget
2019-07-25 15:56 ` [PATCH 0/2] Clean up more of the fall-out from dropping the scripted git rebase Junio C Hamano
2 siblings, 0 replies; 5+ messages in thread
From: Johannes Schindelin via GitGitGadget @ 2019-07-24 21:15 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano, Johannes Schindelin
From: Johannes Schindelin <johannes.schindelin@gmx.de>
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>
---
builtin/rebase.c | 4 ----
git.c | 7 +------
2 files changed, 1 insertion(+), 10 deletions(-)
diff --git a/builtin/rebase.c b/builtin/rebase.c
index 798b9ae2d7..b33ec9c7c0 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -1481,10 +1481,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);
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 },
--
gitgitgadget
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 0/2] Clean up more of the fall-out from dropping the scripted git rebase
2019-07-24 21:14 [PATCH 0/2] Clean up more of the fall-out from dropping the scripted git rebase Johannes Schindelin via GitGitGadget
2019-07-24 21:14 ` [PATCH 1/2] rebase: fix white-space Johannes Schindelin via GitGitGadget
2019-07-24 21:15 ` [PATCH 2/2] git: mark cmd_rebase as requiring a worktree Johannes Schindelin via GitGitGadget
@ 2019-07-25 15:56 ` Junio C Hamano
2019-07-25 18:53 ` Johannes Schindelin
2 siblings, 1 reply; 5+ messages in thread
From: Junio C Hamano @ 2019-07-25 15:56 UTC (permalink / raw)
To: Johannes Schindelin via GitGitGadget; +Cc: git
"Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
writes:
> I had prepared these patches even before v2.22.0, but deemed them not
> critical enough to push into that release.
Thanks. Both of these look quite sensible. Will queue and
fast-track.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 0/2] Clean up more of the fall-out from dropping the scripted git rebase
2019-07-25 15:56 ` [PATCH 0/2] Clean up more of the fall-out from dropping the scripted git rebase Junio C Hamano
@ 2019-07-25 18:53 ` Johannes Schindelin
0 siblings, 0 replies; 5+ messages in thread
From: Johannes Schindelin @ 2019-07-25 18:53 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Johannes Schindelin via GitGitGadget, git
Hi Junio,
On Thu, 25 Jul 2019, Junio C Hamano wrote:
> "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
> writes:
>
> > I had prepared these patches even before v2.22.0, but deemed them not
> > critical enough to push into that release.
>
> Thanks. Both of these look quite sensible. Will queue and
> fast-track.
Thank you!
Dscho
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-07-25 18:53 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-07-24 21:14 [PATCH 0/2] Clean up more of the fall-out from dropping the scripted git rebase Johannes Schindelin via GitGitGadget
2019-07-24 21:14 ` [PATCH 1/2] rebase: fix white-space Johannes Schindelin via GitGitGadget
2019-07-24 21:15 ` [PATCH 2/2] git: mark cmd_rebase as requiring a worktree Johannes Schindelin via GitGitGadget
2019-07-25 15:56 ` [PATCH 0/2] Clean up more of the fall-out from dropping the scripted git rebase Junio C Hamano
2019-07-25 18:53 ` Johannes Schindelin
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).