X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=t%2Ft3500-cherry.sh;h=f038f34b7c03b419b9341770a6924767a0b8e8d7;hb=48c250a121a425a1860226b6a7061aecfbab5246;hp=4911c48378a137471d2ad56747ceed11d0115be5;hpb=5f54de5bd07481f6d88e8dbd5551f3356ecbf513;p=git.git diff --git a/t/t3500-cherry.sh b/t/t3500-cherry.sh index 4911c4837..f038f34b7 100755 --- a/t/t3500-cherry.sh +++ b/t/t3500-cherry.sh @@ -17,25 +17,28 @@ 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." && + test_tick && + 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." && + test_tick && + git commit -m "Add B." && - sleep 2 && echo AnotherSecond > C && git update-index --add C && - git-commit -m "Add C." && + test_tick && + 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." && + test_tick && + git commit -m "Modify A." && expr "$(echo $(git cherry master my-topic-branch) )" : "+ [^ ]* + .*" '