| Message ID | ed41e8d7abc93603063e9a99f628548608413d34.1564046191.git.gitgitgadget@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Add the REBASE_P prerequisite to two more test cases | expand |
"Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com> writes: > From: Johannes Schindelin <johannes.schindelin@gmx.de> > > 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 <johannes.schindelin@gmx.de> > --- > 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 <gitster@pobox.com> writes: > "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com> > writes: > >> From: Johannes Schindelin <johannes.schindelin@gmx.de> >> >> 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 <johannes.schindelin@gmx.de> >> --- >> 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'?
Hi Junio, On Thu, 25 Jul 2019, Junio C Hamano wrote: > Junio C Hamano <gitster@pobox.com> writes: > > > "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com> > > writes: > > > >> From: Johannes Schindelin <johannes.schindelin@gmx.de> > >> > >> 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 <johannes.schindelin@gmx.de> > >> --- > >> 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
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 '