blob: 3d5c238c8150c13b1244f8c4208856714265245a [file] [log] [blame]
Junio C Hamanoc0234b22008-07-03 12:09:48 -07001#!/bin/sh
2
3test_description='remote tracking stats'
4
5. ./test-lib.sh
6
7advance () {
8 echo "$1" >"$1" &&
9 git add "$1" &&
10 test_tick &&
11 git commit -m "$1"
12}
13
14test_expect_success setup '
Jeff Kinge6821d02015-03-25 01:29:52 -040015 advance a &&
16 advance b &&
17 advance c &&
Junio C Hamanoc0234b22008-07-03 12:09:48 -070018 git clone . test &&
19 (
20 cd test &&
21 git checkout -b b1 origin &&
22 git reset --hard HEAD^ &&
23 advance d &&
24 git checkout -b b2 origin &&
25 git reset --hard b1 &&
26 git checkout -b b3 origin &&
27 git reset --hard HEAD^ &&
28 git checkout -b b4 origin &&
29 advance e &&
Jiang Xinf2e08732013-08-26 15:02:48 +080030 advance f &&
31 git checkout -b brokenbase origin &&
32 git checkout -b b5 --track brokenbase &&
33 advance g &&
Jiang Xinf2234592013-08-26 15:02:49 +080034 git branch -d brokenbase &&
35 git checkout -b b6 origin
Michael J Gruber57dac0b2009-03-26 21:53:24 +010036 ) &&
37 git checkout -b follower --track master &&
Jiang Xinf2e08732013-08-26 15:02:48 +080038 advance h
Junio C Hamanoc0234b22008-07-03 12:09:48 -070039'
40
Torstein Hegge6b364d42013-11-14 19:18:01 +010041script='s/^..\(b.\) *[0-9a-f]* \(.*\)$/\1 \2/p'
Junio C Hamanoc0234b22008-07-03 12:09:48 -070042cat >expect <<\EOF
Torstein Hegge6b364d42013-11-14 19:18:01 +010043b1 [ahead 1, behind 1] d
44b2 [ahead 1, behind 1] d
45b3 [behind 1] b
46b4 [ahead 2] f
47b5 g
48b6 c
Junio C Hamanoc0234b22008-07-03 12:09:48 -070049EOF
50
Junio C Hamanob3e19002011-04-12 16:33:39 -070051test_expect_success 'branch -v' '
Junio C Hamanoc0234b22008-07-03 12:09:48 -070052 (
53 cd test &&
54 git branch -v
55 ) |
56 sed -n -e "$script" >actual &&
Junio C Hamanob3e19002011-04-12 16:33:39 -070057 test_i18ncmp expect actual
Junio C Hamanoc0234b22008-07-03 12:09:48 -070058'
59
Michael J Gruberafc16922011-08-26 16:05:11 +020060cat >expect <<\EOF
Torstein Hegge6b364d42013-11-14 19:18:01 +010061b1 [origin/master: ahead 1, behind 1] d
62b2 [origin/master: ahead 1, behind 1] d
63b3 [origin/master: behind 1] b
64b4 [origin/master: ahead 2] f
65b5 [brokenbase: gone] g
66b6 [origin/master] c
Michael J Gruberafc16922011-08-26 16:05:11 +020067EOF
68
69test_expect_success 'branch -vv' '
70 (
71 cd test &&
72 git branch -vv
73 ) |
74 sed -n -e "$script" >actual &&
75 test_i18ncmp expect actual
76'
77
Jiang Xinf2e08732013-08-26 15:02:48 +080078test_expect_success 'checkout (diverged from upstream)' '
Junio C Hamanoc0234b22008-07-03 12:09:48 -070079 (
80 cd test && git checkout b1
81 ) >actual &&
Jonathan Nieder76642cc2012-04-13 23:45:31 -050082 test_i18ngrep "have 1 and 1 different" actual
Junio C Hamanoc0234b22008-07-03 12:09:48 -070083'
84
Michael J Gruber5e6e2b42009-04-01 23:42:49 +020085test_expect_success 'checkout with local tracked branch' '
Michael J Gruber57dac0b2009-03-26 21:53:24 +010086 git checkout master &&
Jonathan Niedera48fcd82010-10-30 20:46:54 -050087 git checkout follower >actual &&
Jonathan Nieder76642cc2012-04-13 23:45:31 -050088 test_i18ngrep "is ahead of" actual
Michael J Gruber57dac0b2009-03-26 21:53:24 +010089'
90
Jiang Xinf2e08732013-08-26 15:02:48 +080091test_expect_success 'checkout (upstream is gone)' '
92 (
93 cd test &&
94 git checkout b5
95 ) >actual &&
96 test_i18ngrep "is based on .*, but the upstream is gone." actual
97'
98
Jiang Xinf2234592013-08-26 15:02:49 +080099test_expect_success 'checkout (up-to-date with upstream)' '
100 (
101 cd test && git checkout b6
102 ) >actual &&
103 test_i18ngrep "Your branch is up-to-date with .origin/master" actual
104'
105
Jiang Xinf2e08732013-08-26 15:02:48 +0800106test_expect_success 'status (diverged from upstream)' '
Junio C Hamanoc0234b22008-07-03 12:09:48 -0700107 (
108 cd test &&
109 git checkout b1 >/dev/null &&
110 # reports nothing to commit
Junio C Hamano9e4b7ab2009-08-15 02:27:39 -0700111 test_must_fail git commit --dry-run
Junio C Hamanoc0234b22008-07-03 12:09:48 -0700112 ) >actual &&
Jonathan Nieder76642cc2012-04-13 23:45:31 -0500113 test_i18ngrep "have 1 and 1 different" actual
Junio C Hamanoc0234b22008-07-03 12:09:48 -0700114'
115
Jiang Xinf2e08732013-08-26 15:02:48 +0800116test_expect_success 'status (upstream is gone)' '
117 (
118 cd test &&
119 git checkout b5 >/dev/null &&
120 # reports nothing to commit
121 test_must_fail git commit --dry-run
122 ) >actual &&
123 test_i18ngrep "is based on .*, but the upstream is gone." actual
124'
125
Jiang Xinf2234592013-08-26 15:02:49 +0800126test_expect_success 'status (up-to-date with upstream)' '
127 (
128 cd test &&
129 git checkout b6 >/dev/null &&
130 # reports nothing to commit
131 test_must_fail git commit --dry-run
132 ) >actual &&
133 test_i18ngrep "Your branch is up-to-date with .origin/master" actual
134'
135
Jiang Xinf2e08732013-08-26 15:02:48 +0800136cat >expect <<\EOF
137## b1...origin/master [ahead 1, behind 1]
138EOF
139
140test_expect_success 'status -s -b (diverged from upstream)' '
141 (
142 cd test &&
143 git checkout b1 >/dev/null &&
144 git status -s -b | head -1
145 ) >actual &&
146 test_i18ncmp expect actual
147'
148
149cat >expect <<\EOF
150## b5...brokenbase [gone]
151EOF
152
153test_expect_success 'status -s -b (upstream is gone)' '
154 (
155 cd test &&
156 git checkout b5 >/dev/null &&
157 git status -s -b | head -1
158 ) >actual &&
159 test_i18ncmp expect actual
160'
161
Jiang Xinf2234592013-08-26 15:02:49 +0800162cat >expect <<\EOF
163## b6...origin/master
164EOF
165
166test_expect_success 'status -s -b (up-to-date with upstream)' '
167 (
168 cd test &&
169 git checkout b6 >/dev/null &&
170 git status -s -b | head -1
171 ) >actual &&
172 test_i18ncmp expect actual
173'
174
Johan Herland21b5b1e2011-02-17 00:12:20 +0100175test_expect_success 'fail to track lightweight tags' '
Michael J Gruber1be570f2009-05-11 16:42:53 +0200176 git checkout master &&
177 git tag light &&
Johan Herland21b5b1e2011-02-17 00:12:20 +0100178 test_must_fail git branch --track lighttrack light >actual &&
Jonathan Nieder76642cc2012-04-13 23:45:31 -0500179 test_i18ngrep ! "set up to track" actual &&
Johan Herland21b5b1e2011-02-17 00:12:20 +0100180 test_must_fail git checkout lighttrack
Michael J Gruber1be570f2009-05-11 16:42:53 +0200181'
Junio C Hamanoc0234b22008-07-03 12:09:48 -0700182
Johan Herland21b5b1e2011-02-17 00:12:20 +0100183test_expect_success 'fail to track annotated tags' '
Michael J Gruber1be570f2009-05-11 16:42:53 +0200184 git checkout master &&
185 git tag -m heavy heavy &&
Johan Herland21b5b1e2011-02-17 00:12:20 +0100186 test_must_fail git branch --track heavytrack heavy >actual &&
Jonathan Nieder76642cc2012-04-13 23:45:31 -0500187 test_i18ngrep ! "set up to track" actual &&
Johan Herland21b5b1e2011-02-17 00:12:20 +0100188 test_must_fail git checkout heavytrack
Michael J Gruber1be570f2009-05-11 16:42:53 +0200189'
Ilari Liusvaara4fc50062010-01-18 22:44:11 +0200190
191test_expect_success 'setup tracking with branch --set-upstream on existing branch' '
192 git branch from-master master &&
193 test_must_fail git config branch.from-master.merge > actual &&
194 git branch --set-upstream from-master master &&
195 git config branch.from-master.merge > actual &&
196 grep -q "^refs/heads/master$" actual
197'
198
199test_expect_success '--set-upstream does not change branch' '
200 git branch from-master2 master &&
201 test_must_fail git config branch.from-master2.merge > actual &&
202 git rev-list from-master2 &&
203 git update-ref refs/heads/from-master2 from-master2^ &&
204 git rev-parse from-master2 >expect2 &&
205 git branch --set-upstream from-master2 master &&
206 git config branch.from-master.merge > actual &&
207 git rev-parse from-master2 >actual2 &&
208 grep -q "^refs/heads/master$" actual &&
209 cmp expect2 actual2
210'
Michael J Grubere9d4f742011-08-19 13:45:43 +0200211
212test_expect_success '--set-upstream @{-1}' '
213 git checkout from-master &&
214 git checkout from-master2 &&
215 git config branch.from-master2.merge > expect2 &&
216 git branch --set-upstream @{-1} follower &&
217 git config branch.from-master.merge > actual &&
218 git config branch.from-master2.merge > actual2 &&
219 git branch --set-upstream from-master follower &&
220 git config branch.from-master.merge > expect &&
221 test_cmp expect2 actual2 &&
222 test_cmp expect actual
223'
224
Junio C Hamanoc0234b22008-07-03 12:09:48 -0700225test_done