Add the REBASE_P prerequisite to two more test cases
cover Add the REBASE_P prerequisite to two more test cases
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
Signature · 1 line
gitgitgadget
PATCH 1/1 t3422: mark two test cases as requiring support for `--preserve-merges`
From: Johannes Schindelin <[email protected]>
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.
--- t/t3422-rebase-incompatible-options.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
t/t3422-rebase-incompatible-options.sh +2 -2
@@ -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 '
Signature · 1 line
gitgitgadget
Re: [PATCH 1/1] t3422: mark two test cases as requiring support for `--preserve-merges`
"Johannes Schindelin via GitGitGadget" <[email protected]>
Quoted 8 lines · writes:
From: Johannes Schindelin <[email protected]>
We started marking all of those test cases that require
git rebase -pto work in the recent past, to allow for skipping them (because the--preserve-mergesbackend 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).
Quoted 8 lines
This patch marks two previously forgotten test cases with the
REBASE_Pprerequisite, to allow skipping them via setting the environment variableGIT_TEST_SKIP_REBASE_P.Signed-off-by Johannes Schindelin <[email protected]>--- t/t3422-rebase-incompatible-options.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Thanks.
Quoted 20 lines
t/t3422-rebase-incompatible-options.sh +2
-2@@ -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 '
Re: [PATCH 1/1] t3422: mark two test cases as requiring support for `--preserve-merges`
Quoted 15 lines · Junio C Hamano
"Johannes Schindelin via GitGitGadget" <[email protected]>
Quoted 12 lines · writes:
From: Johannes Schindelin <[email protected]>
We started marking all of those test cases that require
git rebase -pto work in the recent past, to allow for skipping them (because the--preserve-mergesbackend 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_Pprerequisite, to allow skipping them via setting the environment variableGIT_TEST_SKIP_REBASE_P.
Quoted 6 lines
Quoted 4 lines
Signed-off-by Johannes Schindelin <[email protected]>--- 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'?
Re: [PATCH 1/1] t3422: mark two test cases as requiring support for `--preserve-merges`
Hi Junio,
Quoted 22 lines · Junio C Hamano
Quoted 20 lines · Junio C Hamano
"Johannes Schindelin via GitGitGadget" <[email protected]>
Quoted 16 lines · writes:
From: Johannes Schindelin <[email protected]>
We started marking all of those test cases that require
git rebase -pto work in the recent past, to allow for skipping them (because the--preserve-mergesbackend 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_Pprerequisite, to allow skipping them via setting the environment variableGIT_TEST_SKIP_REBASE_P.Signed-off-by Johannes Schindelin <[email protected]>--- t/t3422-rebase-incompatible-options.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Quoted 6 lines
Quoted 1 line
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 requiringrebase -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