{"thread":{"id":"51189","subject":"[PATCH 0/3] Deprecate git rebase -p even more","startedAt":"2019-05-28T12:42:17Z","lastAt":"2019-05-28T12:42:21Z","messageCount":4,"participants":["Johannes Schindelin via GitGitGadget"],"isPatch":true,"patchVersion":1,"patchTotal":3},"messages":[{"id":"376295","messageId":"pull.227.git.gitgitgadget@gmail.com","threadId":"51189","inReplyTo":null,"subject":"[PATCH 0/3] Deprecate git rebase -p even more","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2019-05-28T12:42:14Z","receivedAt":"2019-05-28T12:42:17Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Turns out that I forgot a couple of spots when I sent the patch series to\ndeprecate git rebase -p earlier...\n\nJohannes Schindelin (3):\n tests: mark a couple more test cases as requiring `rebase -p`\n docs: say that `--rebase=preserve` is deprecated\n rebase docs: recommend `-r` over `-p`\n\n Documentation/git-pull.txt | 5 +++--\n Documentation/git-rebase.txt | 5 +++--\n t/t3422-rebase-incompatible-options.sh | 5 +++--\n t/t3427-rebase-subtree.sh | 15 ++++++++++-----\n 4 files changed, 19 insertions(+), 11 deletions(-)\n\n\nbase-commit: aa25c82427ae70aebf3b8f970f2afd54e9a2a8c6\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-227%2Fdscho%2Fdeprecate-rebase-p-more-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-227/dscho/deprecate-rebase-p-more-v1\nPull-Request: https://github.com/gitgitgadget/git/pull/227\n-- \ngitgitgadget\n"},{"id":"376296","messageId":"d71308c75c60dbc8208063a50fc5285da557653b.1559047333.git.gitgitgadget@gmail.com","threadId":"51189","inReplyTo":"pull.227.git.gitgitgadget@gmail.com","subject":"[PATCH 1/3] tests: mark a couple more test cases as requiring `rebase -p`","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2019-05-28T12:42:14Z","receivedAt":"2019-05-28T12:42:19Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"From: Johannes Schindelin \n\nThe `--preserve-merges` option has been deprecated, and as a consequence\nwe started to mark test cases that require that option to be supported,\nin preparation for removing that support eventually.\n\nSince we marked those test cases, a couple more crept into the test\nsuite, and with this patch, we mark them, too.\n\nSigned-off-by: Johannes Schindelin \n---\n t/t3422-rebase-incompatible-options.sh | 5 +++--\n t/t3427-rebase-subtree.sh | 15 ++++++++++-----\n 2 files changed, 13 insertions(+), 7 deletions(-)\n\ndiff --git a/t/t3422-rebase-incompatible-options.sh b/t/t3422-rebase-incompatible-options.sh\nindex bb78a6ec86..a5868ea152 100755\n--- a/t/t3422-rebase-incompatible-options.sh\n+++ b/t/t3422-rebase-incompatible-options.sh\n@@ -65,12 +65,13 @@ test_rebase_am_only --ignore-whitespace\n test_rebase_am_only --committer-date-is-author-date\n test_rebase_am_only -C4\n \n-test_expect_success '--preserve-merges incompatible with --signoff' '\n+test_expect_success REBASE_P '--preserve-merges incompatible with --signoff' '\n \tgit checkout B^0 &&\n \ttest_must_fail git rebase --preserve-merges --signoff A\n '\n \n-test_expect_success '--preserve-merges incompatible with --rebase-merges' '\n+test_expect_success REBASE_P \\\n+\t'--preserve-merges incompatible with --rebase-merges' '\n \tgit checkout B^0 &&\n \ttest_must_fail git rebase --preserve-merges --rebase-merges A\n '\ndiff --git a/t/t3427-rebase-subtree.sh b/t/t3427-rebase-subtree.sh\nindex 3780877e4e..d8640522a0 100755\n--- a/t/t3427-rebase-subtree.sh\n+++ b/t/t3427-rebase-subtree.sh\n@@ -38,7 +38,8 @@ test_expect_success 'setup' '\n '\n \n # FAILURE: Does not preserve master4.\n-test_expect_failure 'Rebase -Xsubtree --preserve-merges --onto commit 4' '\n+test_expect_failure REBASE_P \\\n+\t'Rebase -Xsubtree --preserve-merges --onto commit 4' '\n \treset_rebase &&\n \tgit checkout -b rebase-preserve-merges-4 master &&\n \tgit filter-branch --prune-empty -f --subdirectory-filter files_subtree &&\n@@ -48,7 +49,8 @@ test_expect_failure 'Rebase -Xsubtree --preserve-merges --onto commit 4' '\n '\n \n # FAILURE: Does not preserve master5.\n-test_expect_failure 'Rebase -Xsubtree --preserve-merges --onto commit 5' '\n+test_expect_failure REBASE_P \\\n+\t'Rebase -Xsubtree --preserve-merges --onto commit 5' '\n \treset_rebase &&\n \tgit checkout -b rebase-preserve-merges-5 master &&\n \tgit filter-branch --prune-empty -f --subdirectory-filter files_subtree &&\n@@ -58,7 +60,8 @@ test_expect_failure 'Rebase -Xsubtree --preserve-merges --onto commit 5' '\n '\n \n # FAILURE: Does not preserve master4.\n-test_expect_failure 'Rebase -Xsubtree --keep-empty --preserve-merges --onto commit 4' '\n+test_expect_failure REBASE_P \\\n+\t'Rebase -Xsubtree --keep-empty --preserve-merges --onto commit 4' '\n \treset_rebase &&\n \tgit checkout -b rebase-keep-empty-4 master &&\n \tgit filter-branch --prune-empty -f --subdirectory-filter files_subtree &&\n@@ -68,7 +71,8 @@ test_expect_failure 'Rebase -Xsubtree --keep-empty --preserve-merges --onto comm\n '\n \n # FAILURE: Does not preserve master5.\n-test_expect_failure 'Rebase -Xsubtree --keep-empty --preserve-merges --onto commit 5' '\n+test_expect_failure REBASE_P \\\n+\t'Rebase -Xsubtree --keep-empty --preserve-merges --onto commit 5' '\n \treset_rebase &&\n \tgit checkout -b rebase-keep-empty-5 master &&\n \tgit filter-branch --prune-empty -f --subdirectory-filter files_subtree &&\n@@ -78,7 +82,8 @@ test_expect_failure 'Rebase -Xsubtree --keep-empty --preserve-merges --onto comm\n '\n \n # FAILURE: Does not preserve Empty.\n-test_expect_failure 'Rebase -Xsubtree --keep-empty --preserve-merges --onto empty commit' '\n+test_expect_failure REBASE_P \\\n+\t'Rebase -Xsubtree --keep-empty --preserve-merges --onto empty commit' '\n \treset_rebase &&\n \tgit checkout -b rebase-keep-empty-empty master &&\n \tgit filter-branch --prune-empty -f --subdirectory-filter files_subtree &&\n-- \ngitgitgadget\n\n"},{"id":"376297","messageId":"09cdff86fb42ee0dbc6ce6a1e276a17811a72021.1559047333.git.gitgitgadget@gmail.com","threadId":"51189","inReplyTo":"pull.227.git.gitgitgadget@gmail.com","subject":"[PATCH 2/3] docs: say that `--rebase=preserve` is deprecated","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2019-05-28T12:42:15Z","receivedAt":"2019-05-28T12:42:19Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"From: Johannes Schindelin \n\nAs of Git v2.22.0, the `--preserve-merges` backend of `git rebase` will\nbe officially deprecated in favor of the `--rebase-merges` backend.\nConsequently, `git pull --rebase=preserve` will also be deprected. State\nthis explicitly.\n\nSigned-off-by: Johannes Schindelin \n---\n Documentation/git-pull.txt | 5 +++--\n 1 file changed, 3 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt\nindex 118d9d86f7..a5e9501a0a 100644\n--- a/Documentation/git-pull.txt\n+++ b/Documentation/git-pull.txt\n@@ -112,8 +112,9 @@ When set to `merges`, rebase using `git rebase --rebase-merges` so that\n the local merge commits are included in the rebase (see\n linkgit:git-rebase[1] for details).\n +\n-When set to preserve, rebase with the `--preserve-merges` option passed\n-to `git rebase` so that locally created merge commits will not be flattened.\n+When set to `preserve` (deprecated in favor of `merges`), rebase with the\n+`--preserve-merges` option passed to `git rebase` so that locally created\n+merge commits will not be flattened.\n +\n When false, merge the current branch into the upstream branch.\n +\n-- \ngitgitgadget\n\n"},{"id":"376298","messageId":"363da05a66360d2b5f31391878f08dcf81b04915.1559047333.git.gitgitgadget@gmail.com","threadId":"51189","inReplyTo":"pull.227.git.gitgitgadget@gmail.com","subject":"[PATCH 3/3] rebase docs: recommend `-r` over `-p`","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2019-05-28T12:42:16Z","receivedAt":"2019-05-28T12:42:21Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"From: Johannes Schindelin \n\nThe `--preserve-merges` option is now deprecated in favor of\n`--rebase-merges`; Let's stop recommending the former.\n\nSigned-off-by: Johannes Schindelin \n---\n Documentation/git-rebase.txt | 5 +++--\n 1 file changed, 3 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt\nindex f5e6ae3907..5e4e927647 100644\n--- a/Documentation/git-rebase.txt\n+++ b/Documentation/git-rebase.txt\n@@ -675,7 +675,8 @@ $ git rebase -i HEAD~5\n \n And move the first patch to the end of the list.\n \n-You might want to preserve merges, if you have a history like this:\n+You might want to recreate merge commits, e.g. if you have a history\n+like this:\n \n ------------------\n X\n@@ -689,7 +690,7 @@ Suppose you want to rebase the side branch starting at \"A\" to \"Q\". Make\n sure that the current HEAD is \"B\", and call\n \n -----------------------------\n-$ git rebase -i -p --onto Q O\n+$ git rebase -i -r --onto Q O\n -----------------------------\n \n Reordering and editing commits usually creates untested intermediate\n-- \ngitgitgadget\n"}]}