X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=t%2Ft3500-cherry.sh;h=f038f34b7c03b419b9341770a6924767a0b8e8d7;hb=42779124a2f158583f89d23dec78266ea3471103;hp=dadbbc2a9f9b70a4e33f5aa825b8f9fe14eec124;hpb=faf1dc7223be9ffddf775916913bb8e22762cdfb;p=git.git diff --git a/t/t3500-cherry.sh b/t/t3500-cherry.sh index dadbbc2a9..f038f34b7 100755 --- a/t/t3500-cherry.sh +++ b/t/t3500-cherry.sh @@ -17,17 +17,19 @@ 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 && + test_tick && git commit -m "Add A." && git checkout -b my-topic-branch && echo Second > B && git update-index --add B && + test_tick && git commit -m "Add B." && - sleep 2 && echo AnotherSecond > C && git update-index --add C && + test_tick && git commit -m "Add C." && git checkout -f master && @@ -35,6 +37,7 @@ test_expect_success \ echo Third >> A && git update-index A && + test_tick && git commit -m "Modify A." && expr "$(echo $(git cherry master my-topic-branch) )" : "+ [^ ]* + .*"