File tree Expand file tree Collapse file tree 1 file changed +9
-9
lines changed
Expand file tree Collapse file tree 1 file changed +9
-9
lines changed Original file line number Diff line number Diff line change 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
135GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
146export 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+
6666test_expect_success ' cherry-pick after renaming branch' '
6767
6868 git checkout rename2 &&
You can’t perform that action at this time.
0 commit comments