diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-05-09 16:45:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-05-09 16:45:46 -0700 |
| commit | 0004d97099b78987ad143a5e797cc972621cdbe0 (patch) | |
| tree | d13a9339236d7fb1114bdec8f835021e945a9fc8 | |
| parent | 53b29442a86f9d89308a223ce03efae5374d2d11 (diff) | |
| parent | 8bb19c14fb38645ad708d97b06664bf1a736c02f (diff) | |
| download | git-0004d97099b78987ad143a5e797cc972621cdbe0.tar.gz | |
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
| -rwxr-xr-x | t/t3501-revert-cherry-pick.sh | 18 |
1 files 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 && |