* [PATCH 0/1] Add the REBASE_P prerequisite to two more test cases
@ 2019-07-25 9:16 Johannes Schindelin via GitGitGadget
2019-07-25 9:16 ` [PATCH 1/1] t3422: mark two test cases as requiring support for `--preserve-merges` Johannes Schindelin via GitGitGadget
0 siblings, 1 reply; 5+ messages in thread
From: Johannes Schindelin via GitGitGadget @ 2019-07-25 9:16 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano
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
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/1] t3422: mark two test cases as requiring support for `--preserve-merges`
2019-07-25 9:16 [PATCH 0/1] Add the REBASE_P prerequisite to two more test cases Johannes Schindelin via GitGitGadget
@ 2019-07-25 9:16 ` Johannes Schindelin via GitGitGadget
2019-07-25 16:23 ` Junio C Hamano
0 siblings, 1 reply; 5+ messages in thread
From: Johannes Schindelin via GitGitGadget @ 2019-07-25 9:16 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano, Johannes Schindelin
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(-)
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 1/1] t3422: mark two test cases as requiring support for `--preserve-merges`
2019-07-25 9:16 ` [PATCH 1/1] t3422: mark two test cases as requiring support for `--preserve-merges` Johannes Schindelin via GitGitGadget
@ 2019-07-25 16:23 ` Junio C Hamano
2019-07-25 16:44 ` Junio C Hamano
0 siblings, 1 reply; 5+ messages in thread
From: Junio C Hamano @ 2019-07-25 16:23 UTC (permalink / raw)
To: Johannes Schindelin via GitGitGadget; +Cc: git, Johannes Schindelin
"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
> '
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/1] t3422: mark two test cases as requiring support for `--preserve-merges`
2019-07-25 16:23 ` Junio C Hamano
@ 2019-07-25 16:44 ` Junio C Hamano
2019-07-25 18:37 ` Johannes Schindelin
0 siblings, 1 reply; 5+ messages in thread
From: Junio C Hamano @ 2019-07-25 16:44 UTC (permalink / raw)
To: Johannes Schindelin via GitGitGadget; +Cc: git, Johannes Schindelin
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'?
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/1] t3422: mark two test cases as requiring support for `--preserve-merges`
2019-07-25 16:44 ` Junio C Hamano
@ 2019-07-25 18:37 ` Johannes Schindelin
0 siblings, 0 replies; 5+ messages in thread
From: Johannes Schindelin @ 2019-07-25 18:37 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Johannes Schindelin via GitGitGadget, git
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
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-07-25 18:37 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-07-25 9:16 [PATCH 0/1] Add the REBASE_P prerequisite to two more test cases Johannes Schindelin via GitGitGadget
2019-07-25 9:16 ` [PATCH 1/1] t3422: mark two test cases as requiring support for `--preserve-merges` Johannes Schindelin via GitGitGadget
2019-07-25 16:23 ` Junio C Hamano
2019-07-25 16:44 ` Junio C Hamano
2019-07-25 18:37 ` Johannes Schindelin
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.