Skip to content

Commit 0004d97

Browse files
committed
Merge branch 'ob/t3501-retitle'
Retitle a test script with an overly narrow name. * ob/t3501-retitle: t/t3501-revert-cherry-pick.sh: clarify scope of the file
2 parents 53b2944 + 8bb19c1 commit 0004d97

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

t/t3501-revert-cherry-pick.sh

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,6 @@
11
#!/bin/sh
22

3-
test_description='test cherry-pick and revert with renames
4-
5-
--
6-
+ rename2: renames oops to opos
7-
+ rename1: renames oops to spoo
8-
+ added: adds extra line to oops
9-
++ initial: has lines in oops
10-
11-
'
3+
test_description='miscellaneous basic tests for cherry-pick and revert'
124

135
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
146
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
@@ -63,6 +55,14 @@ test_expect_success 'revert --nonsense' '
6355
test_i18ngrep "[Uu]sage:" msg
6456
'
6557

58+
# the following two test cherry-pick and revert with renames
59+
#
60+
# --
61+
# + rename2: renames oops to opos
62+
# + rename1: renames oops to spoo
63+
# + added: adds extra line to oops
64+
# ++ initial: has lines in oops
65+
6666
test_expect_success 'cherry-pick after renaming branch' '
6767
6868
git checkout rename2 &&

0 commit comments

Comments
 (0)