summaryrefslogtreecommitdiff
path: root/t/t3500-cherry.sh
blob: dadbbc2a9f9b70a4e33f5aa825b8f9fe14eec124 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
#!/bin/sh
#
# Copyright (c) 2006 Yann Dirson, based on t3400 by Amos Waterland
#
 
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
'
. ./test-lib.sh
 
GIT_AUTHOR_EMAIL=bogus_email_address
export GIT_AUTHOR_EMAIL
 
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 checkout -b my-topic-branch &&
 
     echo Second > B &&
     git update-index --add B &&
     git commit -m "Add B." &&
 
     sleep 2 &&
     echo AnotherSecond > 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 commit -m "Modify A." &&
 
     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) )" : "+ [^ ]*"
'
 
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) )" : "+ [^ ]* - .*"
'
 
test_done