core.hidedotfiles: hide '.git' dir by default
[git/dscho.git] / t / t3500-cherry.sh
blobf038f34b7c03b419b9341770a6924767a0b8e8d7
1 #!/bin/sh
3 # Copyright (c) 2006 Yann Dirson, based on t3400 by Amos Waterland
6 test_description='git cherry should detect patches integrated upstream
8 This test cherry-picks one local change of two into master branch, and
9 checks that git cherry only returns the second patch in the local branch
11 . ./test-lib.sh
13 GIT_AUTHOR_EMAIL=bogus_email_address
14 export GIT_AUTHOR_EMAIL
16 test_expect_success \
17 'prepare repository with topic branch, and check cherry finds the 2 patches from there' \
18 'echo First > A &&
19 git update-index --add A &&
20 test_tick &&
21 git commit -m "Add A." &&
23 git checkout -b my-topic-branch &&
25 echo Second > B &&
26 git update-index --add B &&
27 test_tick &&
28 git commit -m "Add B." &&
30 echo AnotherSecond > C &&
31 git update-index --add C &&
32 test_tick &&
33 git commit -m "Add C." &&
35 git checkout -f master &&
36 rm -f B C &&
38 echo Third >> A &&
39 git update-index A &&
40 test_tick &&
41 git commit -m "Modify A." &&
43 expr "$(echo $(git cherry master my-topic-branch) )" : "+ [^ ]* + .*"
46 test_expect_success \
47 'check that cherry with limit returns only the top patch'\
48 'expr "$(echo $(git cherry master my-topic-branch my-topic-branch^1) )" : "+ [^ ]*"
51 test_expect_success \
52 'cherry-pick one of the 2 patches, and check cherry recognized one and only one as new' \
53 'git cherry-pick my-topic-branch^0 &&
54 echo $(git cherry master my-topic-branch) &&
55 expr "$(echo $(git cherry master my-topic-branch) )" : "+ [^ ]* - .*"
58 test_done