mirror of
https://github.com/git/git
synced 2024-10-12 11:32:34 +00:00
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
This commit is contained in:
commit
0004d97099
|
@ -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 &&
|
||||
|
|
Loading…
Reference in a new issue