Fourth batch
[git/raj.git] / t / t3502-cherry-pick-merge.sh
blob8b635a196d5cc57016520466b92b5f439b217a9d
1 #!/bin/sh
3 test_description='cherry picking and reverting a merge
5 b---c
6 / /
7 initial---a
11 . ./test-lib.sh
13 test_expect_success setup '
15 >A &&
16 >B &&
17 git add A B &&
18 git commit -m "Initial" &&
19 git tag initial &&
20 git branch side &&
21 echo new line >A &&
22 git commit -m "add line to A" A &&
23 git tag a &&
24 git checkout side &&
25 echo new line >B &&
26 git commit -m "add line to B" B &&
27 git tag b &&
28 git checkout master &&
29 git merge side &&
30 git tag c
34 test_expect_success 'cherry-pick -m complains of bogus numbers' '
35 # expect 129 here to distinguish between cases where
36 # there was nothing to cherry-pick
37 test_expect_code 129 git cherry-pick -m &&
38 test_expect_code 129 git cherry-pick -m foo b &&
39 test_expect_code 129 git cherry-pick -m -1 b &&
40 test_expect_code 129 git cherry-pick -m 0 b
43 test_expect_success 'cherry-pick explicit first parent of a non-merge' '
45 git reset --hard &&
46 git checkout a^0 &&
47 git cherry-pick -m 1 b &&
48 git diff --exit-code c --
52 test_expect_success 'cherry pick a merge without -m should fail' '
54 git reset --hard &&
55 git checkout a^0 &&
56 test_must_fail git cherry-pick c &&
57 git diff --exit-code a --
61 test_expect_success 'cherry pick a merge (1)' '
63 git reset --hard &&
64 git checkout a^0 &&
65 git cherry-pick -m 1 c &&
66 git diff --exit-code c
70 test_expect_success 'cherry pick a merge (2)' '
72 git reset --hard &&
73 git checkout b^0 &&
74 git cherry-pick -m 2 c &&
75 git diff --exit-code c
79 test_expect_success 'cherry pick a merge relative to nonexistent parent should fail' '
81 git reset --hard &&
82 git checkout b^0 &&
83 test_must_fail git cherry-pick -m 3 c
87 test_expect_success 'revert explicit first parent of a non-merge' '
89 git reset --hard &&
90 git checkout c^0 &&
91 git revert -m 1 b &&
92 git diff --exit-code a --
96 test_expect_success 'revert a merge without -m should fail' '
98 git reset --hard &&
99 git checkout c^0 &&
100 test_must_fail git revert c &&
101 git diff --exit-code c
105 test_expect_success 'revert a merge (1)' '
107 git reset --hard &&
108 git checkout c^0 &&
109 git revert -m 1 c &&
110 git diff --exit-code a --
114 test_expect_success 'revert a merge (2)' '
116 git reset --hard &&
117 git checkout c^0 &&
118 git revert -m 2 c &&
119 git diff --exit-code b --
123 test_expect_success 'revert a merge relative to nonexistent parent should fail' '
125 git reset --hard &&
126 git checkout c^0 &&
127 test_must_fail git revert -m 3 c &&
128 git diff --exit-code c
132 test_done