{"thread":{"id":"51520","subject":"[PATCH 0/2] Clean up more of the fall-out from dropping the scripted git rebase","startedAt":"2019-07-24T21:15:02Z","lastAt":"2019-07-25T18:53:20Z","messageCount":5,"participants":["Johannes Schindelin via GitGitGadget","Junio C Hamano","Johannes Schindelin"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"379218","messageId":"pull.293.git.gitgitgadget@gmail.com","threadId":"51520","inReplyTo":null,"subject":"[PATCH 0/2] Clean up more of the fall-out from dropping the scripted git rebase","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2019-07-24T21:14:58Z","receivedAt":"2019-07-24T21:15:02Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"I had prepared these patches even before v2.22.0, but deemed them not\ncritical enough to push into that release.\n\nJohannes Schindelin (2):\n rebase: fix white-space\n git: mark cmd_rebase as requiring a worktree\n\n builtin/rebase.c | 6 +-----\n git.c | 7 +------\n 2 files changed, 2 insertions(+), 11 deletions(-)\n\n\nbase-commit: 082ef75b7bfc90ac236afbb857a9552a026832b8\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-293%2Fdscho%2Frebase-cleanup-more-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-293/dscho/rebase-cleanup-more-v1\nPull-Request: https://github.com/gitgitgadget/git/pull/293\n-- \ngitgitgadget\n"},{"id":"379219","messageId":"3bcebf1eae3cad9c55d233f2271126a99e9e34cb.1564002897.git.gitgitgadget@gmail.com","threadId":"51520","inReplyTo":"pull.293.git.gitgitgadget@gmail.com","subject":"[PATCH 1/2] rebase: fix white-space","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2019-07-24T21:14:59Z","receivedAt":"2019-07-24T21:15:04Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"From: Johannes Schindelin \n\nThis trailing space was inadvertently introduced in 9fbcc3d203 (Merge\nbranch 'js/rebase-orig-head-fix', 2019-03-20).\n\nSigned-off-by: Johannes Schindelin \n---\n builtin/rebase.c | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/builtin/rebase.c b/builtin/rebase.c\nindex 9c52144fc4..798b9ae2d7 100644\n--- a/builtin/rebase.c\n+++ b/builtin/rebase.c\n@@ -2104,7 +2104,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)\n \tstrbuf_addf(&msg, \"%s: checkout %s\",\n \t\t getenv(GIT_REFLOG_ACTION_ENVIRONMENT), options.onto_name);\n \tif (reset_head(&options.onto->object.oid, \"checkout\", NULL,\n-\t\t RESET_HEAD_DETACH | RESET_ORIG_HEAD | \n+\t\t RESET_HEAD_DETACH | RESET_ORIG_HEAD |\n \t\t RESET_HEAD_RUN_POST_CHECKOUT_HOOK,\n \t\t NULL, msg.buf))\n \t\tdie(_(\"Could not detach HEAD\"));\n-- \ngitgitgadget\n\n"},{"id":"379220","messageId":"bee82eb36f8dc1bd7d31d4db763d0d0e1b0a4b84.1564002897.git.gitgitgadget@gmail.com","threadId":"51520","inReplyTo":"pull.293.git.gitgitgadget@gmail.com","subject":"[PATCH 2/2] git: mark cmd_rebase as requiring a worktree","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2019-07-24T21:15:00Z","receivedAt":"2019-07-24T21:15:04Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"From: Johannes Schindelin \n\nWe skipped marking the \"rebase\" built-in as requiring a .git/ directory\nand a worktree only to allow to spawn the scripted version of `git\nrebase`.\n\nNow that we no longer have that escape hatch, we can change that to the\ncanonical form.\n\nSigned-off-by: Johannes Schindelin \n---\n builtin/rebase.c | 4 ----\n git.c | 7 +------\n 2 files changed, 1 insertion(+), 10 deletions(-)\n\ndiff --git a/builtin/rebase.c b/builtin/rebase.c\nindex 798b9ae2d7..b33ec9c7c0 100644\n--- a/builtin/rebase.c\n+++ b/builtin/rebase.c\n@@ -1481,10 +1481,6 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)\n \t\tusage_with_options(builtin_rebase_usage,\n \t\t\t\t builtin_rebase_options);\n \n-\tprefix = setup_git_directory();\n-\ttrace_repo_setup(prefix);\n-\tsetup_work_tree();\n-\n \toptions.allow_empty_message = 1;\n \tgit_config(rebase_config, &options);\n \ndiff --git a/git.c b/git.c\nindex 1bf9c94550..1461e819c3 100644\n--- a/git.c\n+++ b/git.c\n@@ -549,12 +549,7 @@ static struct cmd_struct commands[] = {\n \t{ \"push\", cmd_push, RUN_SETUP },\n \t{ \"range-diff\", cmd_range_diff, RUN_SETUP | USE_PAGER },\n \t{ \"read-tree\", cmd_read_tree, RUN_SETUP | SUPPORT_SUPER_PREFIX},\n-\t/*\n-\t * NEEDSWORK: Until the rebase is independent and needs no redirection\n-\t * to rebase shell script this is kept as is, then should be changed to\n-\t * RUN_SETUP | NEED_WORK_TREE\n-\t */\n-\t{ \"rebase\", cmd_rebase },\n+\t{ \"rebase\", cmd_rebase, RUN_SETUP | NEED_WORK_TREE },\n \t{ \"rebase--interactive\", cmd_rebase__interactive, RUN_SETUP | NEED_WORK_TREE },\n \t{ \"receive-pack\", cmd_receive_pack },\n \t{ \"reflog\", cmd_reflog, RUN_SETUP },\n-- \ngitgitgadget\n"},{"id":"379276","messageId":"xmqqh87aqfaa.fsf@gitster-ct.c.googlers.com","threadId":"51520","inReplyTo":"pull.293.git.gitgitgadget@gmail.com","subject":"Re: [PATCH 0/2] Clean up more of the fall-out from dropping the scripted git rebase","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2019-07-25T15:56:13Z","receivedAt":"2019-07-25T15:56:20Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Johannes Schindelin via GitGitGadget\" \nwrites:\n\n> I had prepared these patches even before v2.22.0, but deemed them not\n> critical enough to push into that release.\n\nThanks. Both of these look quite sensible. Will queue and\nfast-track.\n"},{"id":"379307","messageId":"nycvar.QRO.7.76.6.1907252052570.21907@tvgsbejvaqbjf.bet","threadId":"51520","inReplyTo":"xmqqh87aqfaa.fsf@gitster-ct.c.googlers.com","subject":"Re: [PATCH 0/2] Clean up more of the fall-out from dropping the scripted git rebase","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2019-07-25T18:53:10Z","receivedAt":"2019-07-25T18:53:20Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Junio,\n\nOn Thu, 25 Jul 2019, Junio C Hamano wrote:\n\n> \"Johannes Schindelin via GitGitGadget\" \n> writes:\n>\n> > I had prepared these patches even before v2.22.0, but deemed them not\n> > critical enough to push into that release.\n>\n> Thanks. Both of these look quite sensible. Will queue and\n> fast-track.\n\nThank you!\nDscho\n"}]}