# [PATCH 0/1] Add the REBASE_P prerequisite to two more test cases 5 messages from 2019-07-25 to 2019-07-25. Participants: Johannes Schindelin via GitGitGadget, Junio C Hamano, Johannes Schindelin. Thread: https://gitlist.dev/t/51521 ## Johannes Schindelin via GitGitGadget, 2019-07-25 09:16 Subject: [PATCH 0/1] Add the REBASE_P prerequisite to two more test cases Message-ID: URL: https://gitlist.dev/e/pull.296.git.gitgitgadget%40gmail.com ``` I had forgotten those previously. Sorry. Please note that there is another set of test cases in t3427 that desires the REBASE_P prerequisite. However, I would like to address this as part of https://github.com/gitgitgadget/git/pull/294 instead (because I kind of had to pour substantial work into that test script as part of that patch series anyway, so...). Johannes Schindelin (1): t3422: mark two test cases as requiring support for `--preserve-merges` t/t3422-rebase-incompatible-options.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) base-commit: 082ef75b7bfc90ac236afbb857a9552a026832b8 Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-296%2Fdscho%2Frebase-p-prereq-v1 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-296/dscho/rebase-p-prereq-v1 Pull-Request: https://github.com/gitgitgadget/git/pull/296 -- gitgitgadget ``` ## Johannes Schindelin via GitGitGadget, 2019-07-25 09:16 Subject: [PATCH 1/1] t3422: mark two test cases as requiring support for `--preserve-merges` Message-ID: URL: https://gitlist.dev/e/ed41e8d7abc93603063e9a99f628548608413d34.1564046191.git.gitgitgadget%40gmail.com In-Reply-To: ``` From: Johannes Schindelin We started marking all of those test cases that require `git rebase -p` to work in the recent past, to allow for skipping them (because the `--preserve-merges` backend is already deprecated and will be removed in one of the next major versions, so it is a bit pointless to test its functionality all the time). This patch marks two previously forgotten test cases with the `REBASE_P` prerequisite, to allow skipping them via setting the environment variable `GIT_TEST_SKIP_REBASE_P`. Signed-off-by: Johannes Schindelin --- t/t3422-rebase-incompatible-options.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/t/t3422-rebase-incompatible-options.sh b/t/t3422-rebase-incompatible-options.sh index bb78a6ec86..eb5cb67b06 100755 --- a/t/t3422-rebase-incompatible-options.sh +++ b/t/t3422-rebase-incompatible-options.sh @@ -65,12 +65,12 @@ test_rebase_am_only --ignore-whitespace test_rebase_am_only --committer-date-is-author-date test_rebase_am_only -C4 -test_expect_success '--preserve-merges incompatible with --signoff' ' +test_expect_success REBASE_P '--preserve-merges incompatible with --signoff' ' git checkout B^0 && test_must_fail git rebase --preserve-merges --signoff A ' -test_expect_success '--preserve-merges incompatible with --rebase-merges' ' +test_expect_success REBASE_P '--preserve-merges incompatible with --rebase-merges' ' git checkout B^0 && test_must_fail git rebase --preserve-merges --rebase-merges A ' -- gitgitgadget ``` ## Junio C Hamano, 2019-07-25 16:23 Subject: Re: [PATCH 1/1] t3422: mark two test cases as requiring support for `--preserve-merges` Message-ID: URL: https://gitlist.dev/e/xmqq8ssmqe02.fsf%40gitster-ct.c.googlers.com In-Reply-To: ``` "Johannes Schindelin via GitGitGadget" writes: > From: Johannes Schindelin > > We started marking all of those test cases that require `git rebase -p` > to work in the recent past, to allow for skipping them (because the > `--preserve-merges` backend is already deprecated and will be removed in > one of the next major versions, so it is a bit pointless to test its > functionality all the time). > > This patch marks two previously forgotten test cases with the `REBASE_P` > prerequisite, to allow skipping them via setting the environment > variable `GIT_TEST_SKIP_REBASE_P`. > > Signed-off-by: Johannes Schindelin > --- > t/t3422-rebase-incompatible-options.sh | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Thanks. > > diff --git a/t/t3422-rebase-incompatible-options.sh b/t/t3422-rebase-incompatible-options.sh > index bb78a6ec86..eb5cb67b06 100755 > --- a/t/t3422-rebase-incompatible-options.sh > +++ b/t/t3422-rebase-incompatible-options.sh > @@ -65,12 +65,12 @@ test_rebase_am_only --ignore-whitespace > test_rebase_am_only --committer-date-is-author-date > test_rebase_am_only -C4 > > -test_expect_success '--preserve-merges incompatible with --signoff' ' > +test_expect_success REBASE_P '--preserve-merges incompatible with --signoff' ' > git checkout B^0 && > test_must_fail git rebase --preserve-merges --signoff A > ' > > -test_expect_success '--preserve-merges incompatible with --rebase-merges' ' > +test_expect_success REBASE_P '--preserve-merges incompatible with --rebase-merges' ' > git checkout B^0 && > test_must_fail git rebase --preserve-merges --rebase-merges A > ' ``` ## Junio C Hamano, 2019-07-25 16:44 Subject: Re: [PATCH 1/1] t3422: mark two test cases as requiring support for `--preserve-merges` Message-ID: URL: https://gitlist.dev/e/xmqqpnlyoyh9.fsf%40gitster-ct.c.googlers.com In-Reply-To: ``` Junio C Hamano writes: > "Johannes Schindelin via GitGitGadget" > writes: > >> From: Johannes Schindelin >> >> We started marking all of those test cases that require `git rebase -p` >> to work in the recent past, to allow for skipping them (because the >> `--preserve-merges` backend is already deprecated and will be removed in >> one of the next major versions, so it is a bit pointless to test its >> functionality all the time). >> >> This patch marks two previously forgotten test cases with the `REBASE_P` >> prerequisite, to allow skipping them via setting the environment >> variable `GIT_TEST_SKIP_REBASE_P`. >> >> Signed-off-by: Johannes Schindelin >> --- >> t/t3422-rebase-incompatible-options.sh | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) > > Thanks. Wait. What is the relationship between this one and the part that touches the same path in db4a3f26 ("tests: mark a couple more test cases as requiring `rebase -p`", 2019-05-28), which is reachable even from 'maint'? ``` ## Johannes Schindelin, 2019-07-25 18:37 Subject: Re: [PATCH 1/1] t3422: mark two test cases as requiring support for `--preserve-merges` Message-ID: URL: https://gitlist.dev/e/nycvar.QRO.7.76.6.1907252036070.21907%40tvgsbejvaqbjf.bet In-Reply-To: ``` Hi Junio, On Thu, 25 Jul 2019, Junio C Hamano wrote: > Junio C Hamano writes: > > > "Johannes Schindelin via GitGitGadget" > > writes: > > > >> From: Johannes Schindelin > >> > >> We started marking all of those test cases that require `git rebase -p` > >> to work in the recent past, to allow for skipping them (because the > >> `--preserve-merges` backend is already deprecated and will be removed in > >> one of the next major versions, so it is a bit pointless to test its > >> functionality all the time). > >> > >> This patch marks two previously forgotten test cases with the `REBASE_P` > >> prerequisite, to allow skipping them via setting the environment > >> variable `GIT_TEST_SKIP_REBASE_P`. > >> > >> Signed-off-by: Johannes Schindelin > >> --- > >> t/t3422-rebase-incompatible-options.sh | 4 ++-- > >> 1 file changed, 2 insertions(+), 2 deletions(-) > > > > Thanks. > > Wait. What is the relationship between this one and the part that > touches the same path in db4a3f26 ("tests: mark a couple more test > cases as requiring `rebase -p`", 2019-05-28), which is reachable > even from 'maint'? Aha! The difference is that the current patch series (in fact, all my "deprecate/drop rebase -p" patch series) build on top of js/rebase-cleanup. So js/rebase-cleanup is based on something older than `maint`, eh? Ciao, Dscho ```