* [PATCH] t/t3501-revert-cherry-pick.sh: clarify scope of the file
@ 2023-04-30 10:00 Oswald Buddenhagen
2023-04-30 11:52 ` Oswald Buddenhagen
2023-05-01 15:24 ` Junio C Hamano
0 siblings, 2 replies; 3+ messages in thread
From: Oswald Buddenhagen @ 2023-04-30 10:00 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano
The file started out as a test for picks and reverts with renames, but
has been subsequently populated will all kinds of basic tests, in
accordance with its generic name. Adjust the description to reflect
that.
Signed-off-by: Oswald Buddenhagen <oswald.buddenhagen@gmx•de>
---
Cc: Junio C Hamano <gitster@pobox•com>
---
t/t3501-revert-cherry-pick.sh | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/t/t3501-revert-cherry-pick.sh b/t/t3501-revert-cherry-pick.sh
index 2f3e3e2416..e2ef619323 100755
--- a/t/t3501-revert-cherry-pick.sh
+++ b/t/t3501-revert-cherry-pick.sh
@@ -1,14 +1,6 @@
#!/bin/sh
-test_description='test cherry-pick and revert with renames
-
- --
- + rename2: renames oops to opos
- + rename1: renames oops to spoo
- + added: adds extra line to oops
- ++ initial: has lines in oops
-
-'
+test_description='miscellaneous basic tests for cherry-pick and revert'
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
@@ -63,6 +55,14 @@ test_expect_success 'revert --nonsense' '
test_i18ngrep "[Uu]sage:" msg
'
+# the following two test cherry-pick and revert with renames
+#
+# --
+# + rename2: renames oops to opos
+# + rename1: renames oops to spoo
+# + added: adds extra line to oops
+# ++ initial: has lines in oops
+
test_expect_success 'cherry-pick after renaming branch' '
git checkout rename2 &&
--
2.40.0.152.g15d061e6df
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] t/t3501-revert-cherry-pick.sh: clarify scope of the file
2023-04-30 10:00 [PATCH] t/t3501-revert-cherry-pick.sh: clarify scope of the file Oswald Buddenhagen
@ 2023-04-30 11:52 ` Oswald Buddenhagen
2023-05-01 15:24 ` Junio C Hamano
1 sibling, 0 replies; 3+ messages in thread
From: Oswald Buddenhagen @ 2023-04-30 11:52 UTC (permalink / raw)
To: git
On Sun, Apr 30, 2023 at 12:00:34PM +0200, Oswald Buddenhagen wrote:
>The file started out as a test for picks and reverts with renames, but
>has been subsequently populated will all kinds of basic tests, in
^^^^
"with", obviously.
>accordance with its generic name. Adjust the description to reflect
>that.
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] t/t3501-revert-cherry-pick.sh: clarify scope of the file
2023-04-30 10:00 [PATCH] t/t3501-revert-cherry-pick.sh: clarify scope of the file Oswald Buddenhagen
2023-04-30 11:52 ` Oswald Buddenhagen
@ 2023-05-01 15:24 ` Junio C Hamano
1 sibling, 0 replies; 3+ messages in thread
From: Junio C Hamano @ 2023-05-01 15:24 UTC (permalink / raw)
To: Oswald Buddenhagen; +Cc: git
Oswald Buddenhagen <oswald.buddenhagen@gmx•de> writes:
> The file started out as a test for picks and reverts with renames, but
> has been subsequently populated will all kinds of basic tests, in
> accordance with its generic name. Adjust the description to reflect
> that.
>
> Signed-off-by: Oswald Buddenhagen <oswald.buddenhagen@gmx•de>
> ---
> -test_description='test cherry-pick and revert with renames
> ...
> +test_description='miscellaneous basic tests for cherry-pick and revert'
Looks good.
Will queue.
Thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-05-01 15:24 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-04-30 10:00 [PATCH] t/t3501-revert-cherry-pick.sh: clarify scope of the file Oswald Buddenhagen
2023-04-30 11:52 ` Oswald Buddenhagen
2023-05-01 15:24 ` Junio C Hamano
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox