3 test_description
='remote tracking stats'
14 test_expect_success setup
'
22 git checkout -b b1 origin &&
23 git reset --hard HEAD^ &&
25 git checkout -b b2 origin &&
26 git reset --hard b1 &&
27 git checkout -b b3 origin &&
28 git reset --hard HEAD^ &&
29 git checkout -b b4 origin &&
32 git checkout -b brokenbase origin &&
33 git checkout -b b5 --track brokenbase &&
35 git branch -d brokenbase &&
36 git checkout -b b6 origin
38 git checkout -b follower --track master &&
42 script='s/^..\(b.\) *[0-9a-f]* \(.*\)$/\1 \2/p'
44 b1
[ahead
1, behind
1] d
45 b2
[ahead
1, behind
1] d
52 test_expect_success
'branch -v' '
57 sed -n -e "$script" >actual &&
58 test_i18ncmp expect actual
62 b1
[origin
/master
: ahead
1, behind
1] d
63 b2
[origin
/master
: ahead
1, behind
1] d
64 b3
[origin
/master
: behind
1] b
65 b4
[origin
/master
: ahead
2] f
66 b5
[brokenbase
: gone
] g
70 test_expect_success
'branch -vv' '
75 sed -n -e "$script" >actual &&
76 test_i18ncmp expect actual
79 test_expect_success
'checkout (diverged from upstream)' '
81 cd test && git checkout b1
83 test_i18ngrep "have 1 and 1 different" actual
86 test_expect_success
'checkout with local tracked branch' '
87 git checkout master &&
88 git checkout follower >actual &&
89 test_i18ngrep "is ahead of" actual
92 test_expect_success
'checkout (upstream is gone)' '
97 test_i18ngrep "is based on .*, but the upstream is gone." actual
100 test_expect_success
'checkout (up-to-date with upstream)' '
102 cd test && git checkout b6
104 test_i18ngrep "Your branch is up-to-date with .origin/master" actual
107 test_expect_success
'status (diverged from upstream)' '
110 git checkout b1 >/dev/null &&
111 # reports nothing to commit
112 test_must_fail git commit --dry-run
114 test_i18ngrep "have 1 and 1 different" actual
117 test_expect_success
'status (upstream is gone)' '
120 git checkout b5 >/dev/null &&
121 # reports nothing to commit
122 test_must_fail git commit --dry-run
124 test_i18ngrep "is based on .*, but the upstream is gone." actual
127 test_expect_success
'status (up-to-date with upstream)' '
130 git checkout b6 >/dev/null &&
131 # reports nothing to commit
132 test_must_fail git commit --dry-run
134 test_i18ngrep "Your branch is up-to-date with .origin/master" actual
138 ## b1...origin/master [ahead 1, behind 1]
141 test_expect_success
'status -s -b (diverged from upstream)' '
144 git checkout b1 >/dev/null &&
145 git status -s -b | head -1
147 test_i18ncmp expect actual
151 ## b5...brokenbase [gone]
154 test_expect_success
'status -s -b (upstream is gone)' '
157 git checkout b5 >/dev/null &&
158 git status -s -b | head -1
160 test_i18ncmp expect actual
164 ## b6...origin/master
167 test_expect_success
'status -s -b (up-to-date with upstream)' '
170 git checkout b6 >/dev/null &&
171 git status -s -b | head -1
173 test_i18ncmp expect actual
176 test_expect_success
'fail to track lightweight tags' '
177 git checkout master &&
179 test_must_fail git branch --track lighttrack light >actual &&
180 test_i18ngrep ! "set up to track" actual &&
181 test_must_fail git checkout lighttrack
184 test_expect_success
'fail to track annotated tags' '
185 git checkout master &&
186 git tag -m heavy heavy &&
187 test_must_fail git branch --track heavytrack heavy >actual &&
188 test_i18ngrep ! "set up to track" actual &&
189 test_must_fail git checkout heavytrack
192 test_expect_success
'setup tracking with branch --set-upstream on existing branch' '
193 git branch from-master master &&
194 test_must_fail git config branch.from-master.merge > actual &&
195 git branch --set-upstream from-master master &&
196 git config branch.from-master.merge > actual &&
197 grep -q "^refs/heads/master$" actual
200 test_expect_success
'--set-upstream does not change branch' '
201 git branch from-master2 master &&
202 test_must_fail git config branch.from-master2.merge > actual &&
203 git rev-list from-master2 &&
204 git update-ref refs/heads/from-master2 from-master2^ &&
205 git rev-parse from-master2 >expect2 &&
206 git branch --set-upstream from-master2 master &&
207 git config branch.from-master.merge > actual &&
208 git rev-parse from-master2 >actual2 &&
209 grep -q "^refs/heads/master$" actual &&
213 test_expect_success
'--set-upstream @{-1}' '
214 git checkout from-master &&
215 git checkout from-master2 &&
216 git config branch.from-master2.merge > expect2 &&
217 git branch --set-upstream @{-1} follower &&
218 git config branch.from-master.merge > actual &&
219 git config branch.from-master2.merge > actual2 &&
220 git branch --set-upstream from-master follower &&
221 git config branch.from-master.merge > expect &&
222 test_cmp expect2 actual2 &&
223 test_cmp expect actual