3 test_description
='test git rev-list --cherry-pick -- file'
12 # B changes a file foo.c, adding a line of text. C changes foo.c as
13 # well as bar.c, but the change in foo.c was identical to change B.
14 # D and C change bar in the same way, E and F differently.
16 test_expect_success setup
'
22 git checkout -b branch &&
34 git checkout master &&
35 git checkout branch foo &&
56 test_expect_success
'--left-right' '
57 git rev-list --left-right B...C > actual &&
58 git name-rev --stdin --name-only --refs="*tags/*" \
59 < actual > actual.named &&
60 test_cmp actual.named expect
63 test_expect_success
'--count' '
64 git rev-list --count B...C > actual &&
65 test "$(cat actual)" = 2
68 test_expect_success
'--cherry-pick foo comes up empty' '
69 test -z "$(git rev-list --left-right --cherry-pick B...C -- foo)"
76 test_expect_success
'--cherry-pick bar does not come up empty' '
77 git rev-list --left-right --cherry-pick B...C -- bar > actual &&
78 git name-rev --stdin --name-only --refs="*tags/*" \
79 < actual > actual.named &&
80 test_cmp actual.named expect
83 test_expect_success
'bar does not come up empty' '
84 git rev-list --left-right B...C -- bar > actual &&
85 git name-rev --stdin --name-only --refs="*tags/*" \
86 < actual > actual.named &&
87 test_cmp actual.named expect
95 test_expect_success
'--cherry-pick bar does not come up empty (II)' '
96 git rev-list --left-right --cherry-pick F...E -- bar > actual &&
97 git name-rev --stdin --name-only --refs="*tags/*" \
98 < actual > actual.named &&
99 test_cmp actual.named expect
106 test_expect_success
'--cherry-pick --right-only' '
107 git rev-list --cherry-pick --right-only F...E -- bar > actual &&
108 git name-rev --stdin --name-only --refs="*tags/*" \
109 < actual > actual.named &&
110 test_cmp actual.named expect
113 test_expect_success
'--cherry-pick --left-only' '
114 git rev-list --cherry-pick --left-only E...F -- bar > actual &&
115 git name-rev --stdin --name-only --refs="*tags/*" \
116 < actual > actual.named &&
117 test_cmp actual.named expect
120 test_expect_success
'--cherry-pick with independent, but identical branches' '
121 git symbolic-ref HEAD refs/heads/independent &&
126 git commit -m "independent" &&
129 git commit -m "independent, too" foo &&
130 test -z "$(git rev-list --left-right --cherry-pick \
131 HEAD...master -- foo)"
138 test_expect_success
'--count --left-right' '
139 git rev-list --count --left-right C...D > actual &&
140 test_cmp expect actual