mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t3500-cherry: modernize test format

Browse Source 
Some tests still use the old format with four spaces indentation.
Standardize the tests to the new format with tab indentation.

Signed-off-by: John Cai <johncai86@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
John Cai 2023-05-18 20:03:12 +00:00 committed by Junio C Hamano
parent 350c484239
commit 0a6cb5c42f
1 changed files with 27 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
t/t3500-cherry.sh
View File

@ -16,46 +16,43 @@ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
GIT_AUTHOR_EMAIL=bogus_email_address GIT_AUTHOR_EMAIL=bogus_email_address
export GIT_AUTHOR_EMAIL export GIT_AUTHOR_EMAIL
test_expect_success \ test_expect_success 'prepare repository with topic branch, and check cherry finds the 2 patches from there' '
'prepare repository with topic branch, and check cherry finds the 2 patches from there' \ echo First > A &&
'echo First > A && git update-index --add A &&
git update-index --add A && test_tick &&
test_tick && git commit -m "Add A." &&
git commit -m "Add A." &&
git checkout -b my-topic-branch && git checkout -b my-topic-branch &&
echo Second > B && echo Second > B &&
git update-index --add B && git update-index --add B &&
test_tick && test_tick &&
git commit -m "Add B." && git commit -m "Add B." &&
echo AnotherSecond > C && echo AnotherSecond > C &&
git update-index --add C && git update-index --add C &&
test_tick && test_tick &&
git commit -m "Add C." && git commit -m "Add C." &&
git checkout -f main && git checkout -f main &&
rm -f B C && rm -f B C &&
echo Third >> A && echo Third >> A &&
git update-index A && git update-index A &&
test_tick && test_tick &&
git commit -m "Modify A." && git commit -m "Modify A." &&
expr "$(echo $(git cherry main my-topic-branch) )" : "+ [^ ]* + .*" expr "$(echo $(git cherry main my-topic-branch) )" : "+ [^ ]* + .*"
' '
test_expect_success \ test_expect_success 'check that cherry with limit returns only the top patch' '
'check that cherry with limit returns only the top patch'\ expr "$(echo $(git cherry main my-topic-branch my-topic-branch^1) )" : "+ [^ ]*"
'expr "$(echo $(git cherry main my-topic-branch my-topic-branch^1) )" : "+ [^ ]*"
' '
test_expect_success \ test_expect_success 'cherry-pick one of the 2 patches, and check cherry recognized one and only one as new' '
'cherry-pick one of the 2 patches, and check cherry recognized one and only one as new' \ git cherry-pick my-topic-branch^0 &&
'git cherry-pick my-topic-branch^0 && echo $(git cherry main my-topic-branch) &&
echo $(git cherry main my-topic-branch) && expr "$(echo $(git cherry main my-topic-branch) )" : "+ [^ ]* - .*"
expr "$(echo $(git cherry main my-topic-branch) )" : "+ [^ ]* - .*"
' '
test_expect_success 'cherry ignores whitespace' ' test_expect_success 'cherry ignores whitespace' '