threads / patch / 51520

patch, 2 partsClean up more of the fall-out from dropping the scripted git rebase

Subject: [PATCH 0/2] Clean up more of the fall-out from dropping the scripted git rebase

## tl;dr

5 messages between Jul 24, 2019 and Jul 25, 2019. Diffs are folded; open one to read it.

replies: 4people: 2as markdown or json

Johannes Schindelin via GitGitGadget· Jul 24, 2019, 21:14 UTC · lore

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
Johannes Schindelin via GitGitGadget· Jul 24, 2019, 21:14 UTC · re: Johannes Schindelin via GitGitGadget · lore

[PATCH 1/2] rebase: fix white-space

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(-)
Show changes to builtin/rebase.c +1 −1
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
Johannes Schindelin via GitGitGadget· Jul 24, 2019, 21:15 UTC · re: Johannes Schindelin via GitGitGadget · lore

[PATCH 2/2] git: mark cmd_rebase as requiring a worktree

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(-)
Show changes to 2 files +1 −10

builtin/rebase.c, git.c

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
Junio C Hamano· Jul 25, 2019, 15:56 UTC · re: Johannes Schindelin via GitGitGadget · lore

Re: [PATCH 0/2] Clean up more of the fall-out from dropping the scripted git rebase

"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.

Johannes Schindelin· Jul 25, 2019, 18:53 UTC · re: Junio C Hamano · lore

Re: [PATCH 0/2] Clean up more of the fall-out from dropping the scripted git rebase

Hi Junio,
On Thu, 25 Jul 2019, Junio C Hamano wrote:
Show 8 quoted lines
> "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

← back to recent threads