summaryrefslogtreecommitdiff
path: root/t/t3500-cherry.sh
diff options
context:
space:
mode:
Diffstat (limited to 't/t3500-cherry.sh')
-rwxr-xr-xt/t3500-cherry.sh22
1 files changed, 11 insertions, 11 deletions
diff --git a/t/t3500-cherry.sh b/t/t3500-cherry.sh
index e83bbee074..d0a440feba 100755
--- a/t/t3500-cherry.sh
+++ b/t/t3500-cherry.sh
@@ -3,10 +3,10 @@
# Copyright (c) 2006 Yann Dirson, based on t3400 by Amos Waterland
#
-test_description='git-cherry should detect patches integrated upstream
+test_description='git cherry should detect patches integrated upstream
This test cherry-picks one local change of two into master branch, and
-checks that git-cherry only returns the second patch in the local branch
+checks that git cherry only returns the second patch in the local branch
'
. ./test-lib.sh
@@ -15,40 +15,40 @@ export GIT_AUTHOR_EMAIL=bogus_email_address
test_expect_success \
'prepare repository with topic branch, and check cherry finds the 2 patches from there' \
'echo First > A &&
- git-update-index --add A &&
+ git update-index --add A &&
git-commit -m "Add A." &&
git-checkout -b my-topic-branch &&
echo Second > B &&
- git-update-index --add B &&
+ git update-index --add B &&
git-commit -m "Add B." &&
sleep 2 &&
echo AnotherSecond > C &&
- git-update-index --add C &&
+ git update-index --add C &&
git-commit -m "Add C." &&
git-checkout -f master &&
rm -f B C &&
echo Third >> A &&
- git-update-index A &&
+ git update-index A &&
git-commit -m "Modify A." &&
- expr "$(echo $(git-cherry master my-topic-branch) )" : "+ [^ ]* + .*"
+ expr "$(echo $(git cherry master my-topic-branch) )" : "+ [^ ]* + .*"
'
test_expect_success \
'check that cherry with limit returns only the top patch'\
- 'expr "$(echo $(git-cherry master my-topic-branch my-topic-branch^1) )" : "+ [^ ]*"
+ 'expr "$(echo $(git cherry master my-topic-branch my-topic-branch^1) )" : "+ [^ ]*"
'
test_expect_success \
'cherry-pick one of the 2 patches, and check cherry recognized one and only one as new' \
- 'git-cherry-pick my-topic-branch^0 &&
- echo $(git-cherry master my-topic-branch) &&
- expr "$(echo $(git-cherry master my-topic-branch) )" : "+ [^ ]* - .*"
+ 'git cherry-pick my-topic-branch^0 &&
+ echo $(git cherry master my-topic-branch) &&
+ expr "$(echo $(git cherry master my-topic-branch) )" : "+ [^ ]* - .*"
'
test_done