{"thread":{"id":"51521","subject":"[PATCH 0/1] Add the REBASE_P prerequisite to two more test cases","startedAt":"2019-07-25T09:16:36Z","lastAt":"2019-07-25T18:37:25Z","messageCount":5,"participants":["Johannes Schindelin via GitGitGadget","Junio C Hamano","Johannes Schindelin"],"isPatch":true,"patchVersion":1,"patchTotal":1},"messages":[{"id":"379243","messageId":"pull.296.git.gitgitgadget@gmail.com","threadId":"51521","inReplyTo":null,"subject":"[PATCH 0/1] Add the REBASE_P prerequisite to two more test cases","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2019-07-25T09:16:32Z","receivedAt":"2019-07-25T09:16:36Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"I had forgotten those previously. Sorry.\n\nPlease note that there is another set of test cases in t3427 that desires\nthe REBASE_P prerequisite. However, I would like to address this as part of \nhttps://github.com/gitgitgadget/git/pull/294 instead (because I kind of had\nto pour substantial work into that test script as part of that patch series\nanyway, so...).\n\nJohannes Schindelin (1):\n t3422: mark two test cases as requiring support for\n `--preserve-merges`\n\n t/t3422-rebase-incompatible-options.sh | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)\n\n\nbase-commit: 082ef75b7bfc90ac236afbb857a9552a026832b8\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-296%2Fdscho%2Frebase-p-prereq-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-296/dscho/rebase-p-prereq-v1\nPull-Request: https://github.com/gitgitgadget/git/pull/296\n-- \ngitgitgadget\n"},{"id":"379244","messageId":"ed41e8d7abc93603063e9a99f628548608413d34.1564046191.git.gitgitgadget@gmail.com","threadId":"51521","inReplyTo":"pull.296.git.gitgitgadget@gmail.com","subject":"[PATCH 1/1] t3422: mark two test cases as requiring support for `--preserve-merges`","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2019-07-25T09:16:33Z","receivedAt":"2019-07-25T09:16:37Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"From: Johannes Schindelin \n\nWe started marking all of those test cases that require `git rebase -p`\nto work in the recent past, to allow for skipping them (because the\n`--preserve-merges` backend is already deprecated and will be removed in\none of the next major versions, so it is a bit pointless to test its\nfunctionality all the time).\n\nThis patch marks two previously forgotten test cases with the `REBASE_P`\nprerequisite, to allow skipping them via setting the environment\nvariable `GIT_TEST_SKIP_REBASE_P`.\n\nSigned-off-by: Johannes Schindelin \n---\n t/t3422-rebase-incompatible-options.sh | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/t/t3422-rebase-incompatible-options.sh b/t/t3422-rebase-incompatible-options.sh\nindex bb78a6ec86..eb5cb67b06 100755\n--- a/t/t3422-rebase-incompatible-options.sh\n+++ b/t/t3422-rebase-incompatible-options.sh\n@@ -65,12 +65,12 @@ 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 '--preserve-merges incompatible with --rebase-merges' '\n \tgit checkout B^0 &&\n \ttest_must_fail git rebase --preserve-merges --rebase-merges A\n '\n-- \ngitgitgadget\n"},{"id":"379278","messageId":"xmqq8ssmqe02.fsf@gitster-ct.c.googlers.com","threadId":"51521","inReplyTo":"ed41e8d7abc93603063e9a99f628548608413d34.1564046191.git.gitgitgadget@gmail.com","subject":"Re: [PATCH 1/1] t3422: mark two test cases as requiring support for `--preserve-merges`","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2019-07-25T16:23:57Z","receivedAt":"2019-07-25T16:24:09Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Johannes Schindelin via GitGitGadget\" \nwrites:\n\n> From: Johannes Schindelin \n>\n> We started marking all of those test cases that require `git rebase -p`\n> to work in the recent past, to allow for skipping them (because the\n> `--preserve-merges` backend is already deprecated and will be removed in\n> one of the next major versions, so it is a bit pointless to test its\n> functionality all the time).\n>\n> This patch marks two previously forgotten test cases with the `REBASE_P`\n> prerequisite, to allow skipping them via setting the environment\n> variable `GIT_TEST_SKIP_REBASE_P`.\n>\n> Signed-off-by: Johannes Schindelin \n> ---\n> t/t3422-rebase-incompatible-options.sh | 4 ++--\n> 1 file changed, 2 insertions(+), 2 deletions(-)\n\nThanks.\n\n\n>\n> diff --git a/t/t3422-rebase-incompatible-options.sh b/t/t3422-rebase-incompatible-options.sh\n> index bb78a6ec86..eb5cb67b06 100755\n> --- a/t/t3422-rebase-incompatible-options.sh\n> +++ b/t/t3422-rebase-incompatible-options.sh\n> @@ -65,12 +65,12 @@ 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 '--preserve-merges incompatible with --rebase-merges' '\n> \tgit checkout B^0 &&\n> \ttest_must_fail git rebase --preserve-merges --rebase-merges A\n> '\n"},{"id":"379280","messageId":"xmqqpnlyoyh9.fsf@gitster-ct.c.googlers.com","threadId":"51521","inReplyTo":"xmqq8ssmqe02.fsf@gitster-ct.c.googlers.com","subject":"Re: [PATCH 1/1] t3422: mark two test cases as requiring support for `--preserve-merges`","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2019-07-25T16:44:34Z","receivedAt":"2019-07-25T16:44:42Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Junio C Hamano writes:\n\n> \"Johannes Schindelin via GitGitGadget\" \n> writes:\n>\n>> From: Johannes Schindelin \n>>\n>> We started marking all of those test cases that require `git rebase -p`\n>> to work in the recent past, to allow for skipping them (because the\n>> `--preserve-merges` backend is already deprecated and will be removed in\n>> one of the next major versions, so it is a bit pointless to test its\n>> functionality all the time).\n>>\n>> This patch marks two previously forgotten test cases with the `REBASE_P`\n>> prerequisite, to allow skipping them via setting the environment\n>> variable `GIT_TEST_SKIP_REBASE_P`.\n>>\n>> Signed-off-by: Johannes Schindelin \n>> ---\n>> t/t3422-rebase-incompatible-options.sh | 4 ++--\n>> 1 file changed, 2 insertions(+), 2 deletions(-)\n>\n> Thanks.\n\nWait. What is the relationship between this one and the part that\ntouches the same path in db4a3f26 (\"tests: mark a couple more test\ncases as requiring `rebase -p`\", 2019-05-28), which is reachable\neven from 'maint'?\n\n\n\n"},{"id":"379306","messageId":"nycvar.QRO.7.76.6.1907252036070.21907@tvgsbejvaqbjf.bet","threadId":"51521","inReplyTo":"xmqqpnlyoyh9.fsf@gitster-ct.c.googlers.com","subject":"Re: [PATCH 1/1] t3422: mark two test cases as requiring support for `--preserve-merges`","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2019-07-25T18:37:16Z","receivedAt":"2019-07-25T18:37:25Z","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> Junio C Hamano writes:\n>\n> > \"Johannes Schindelin via GitGitGadget\" \n> > writes:\n> >\n> >> From: Johannes Schindelin \n> >>\n> >> We started marking all of those test cases that require `git rebase -p`\n> >> to work in the recent past, to allow for skipping them (because the\n> >> `--preserve-merges` backend is already deprecated and will be removed in\n> >> one of the next major versions, so it is a bit pointless to test its\n> >> functionality all the time).\n> >>\n> >> This patch marks two previously forgotten test cases with the `REBASE_P`\n> >> prerequisite, to allow skipping them via setting the environment\n> >> variable `GIT_TEST_SKIP_REBASE_P`.\n> >>\n> >> Signed-off-by: Johannes Schindelin \n> >> ---\n> >> t/t3422-rebase-incompatible-options.sh | 4 ++--\n> >> 1 file changed, 2 insertions(+), 2 deletions(-)\n> >\n> > Thanks.\n>\n> Wait. What is the relationship between this one and the part that\n> touches the same path in db4a3f26 (\"tests: mark a couple more test\n> cases as requiring `rebase -p`\", 2019-05-28), which is reachable\n> even from 'maint'?\n\nAha!\n\nThe difference is that the current patch series (in fact, all my\n\"deprecate/drop rebase -p\" patch series) build on top of\njs/rebase-cleanup.\n\nSo js/rebase-cleanup is based on something older than `maint`, eh?\n\nCiao,\nDscho\n"}]}