X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft3500-cherry.sh;h=dadbbc2a9f9b70a4e33f5aa825b8f9fe14eec124;hb=1966af81760aea2966f8f218d442aed5f296b992;hp=4911c48378a137471d2ad56747ceed11d0115be5;hpb=b84c343c885b8168047b2773b5c597d04337d9bd;p=git.git diff --git a/t/t3500-cherry.sh b/t/t3500-cherry.sh index 4911c4837..dadbbc2a9 100755 --- a/t/t3500-cherry.sh +++ b/t/t3500-cherry.sh @@ -17,25 +17,25 @@ 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-commit -m "Add A." && + git commit -m "Add A." && - git-checkout -b my-topic-branch && + git checkout -b my-topic-branch && echo Second > B && git update-index --add B && - git-commit -m "Add B." && + git commit -m "Add B." && sleep 2 && echo AnotherSecond > C && git update-index --add C && - git-commit -m "Add C." && + git commit -m "Add C." && - git-checkout -f master && + git checkout -f master && rm -f B C && echo Third >> A && git update-index A && - git-commit -m "Modify A." && + git commit -m "Modify A." && expr "$(echo $(git cherry master my-topic-branch) )" : "+ [^ ]* + .*" '