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'
50 test_expect_success
'branch -v' '
55 sed -n -e "$script" >actual &&
56 test_i18ncmp expect actual
60 b1 origin
/master
: ahead
1, behind
1
61 b2 origin
/master
: ahead
1, behind
1
62 b3 origin
/master
: behind
1
63 b4 origin
/master
: ahead
2
68 test_expect_success
'branch -vv' '
73 sed -n -e "$script" >actual &&
74 test_i18ncmp expect actual
77 test_expect_success
'checkout (diverged from upstream)' '
79 cd test && git checkout b1
81 test_i18ngrep "have 1 and 1 different" actual
84 test_expect_success
'checkout with local tracked branch' '
85 git checkout master &&
86 git checkout follower >actual &&
87 test_i18ngrep "is ahead of" actual
90 test_expect_success
'checkout (upstream is gone)' '
95 test_i18ngrep "is based on .*, but the upstream is gone." actual
98 test_expect_success
'checkout (up-to-date with upstream)' '
100 cd test && git checkout b6
102 test_i18ngrep "Your branch is up-to-date with .origin/master" actual
105 test_expect_success
'status (diverged from upstream)' '
108 git checkout b1 >/dev/null &&
109 # reports nothing to commit
110 test_must_fail git commit --dry-run
112 test_i18ngrep "have 1 and 1 different" actual
115 test_expect_success
'status (upstream is gone)' '
118 git checkout b5 >/dev/null &&
119 # reports nothing to commit
120 test_must_fail git commit --dry-run
122 test_i18ngrep "is based on .*, but the upstream is gone." actual
125 test_expect_success
'status (up-to-date with upstream)' '
128 git checkout b6 >/dev/null &&
129 # reports nothing to commit
130 test_must_fail git commit --dry-run
132 test_i18ngrep "Your branch is up-to-date with .origin/master" actual
136 ## b1...origin/master [ahead 1, behind 1]
139 test_expect_success
'status -s -b (diverged from upstream)' '
142 git checkout b1 >/dev/null &&
143 git status -s -b | head -1
145 test_i18ncmp expect actual
149 ## b5...brokenbase [gone]
152 test_expect_success
'status -s -b (upstream is gone)' '
155 git checkout b5 >/dev/null &&
156 git status -s -b | head -1
158 test_i18ncmp expect actual
162 ## b6...origin/master
165 test_expect_success
'status -s -b (up-to-date with upstream)' '
168 git checkout b6 >/dev/null &&
169 git status -s -b | head -1
171 test_i18ncmp expect actual
174 test_expect_success
'fail to track lightweight tags' '
175 git checkout master &&
177 test_must_fail git branch --track lighttrack light >actual &&
178 test_i18ngrep ! "set up to track" actual &&
179 test_must_fail git checkout lighttrack
182 test_expect_success
'fail to track annotated tags' '
183 git checkout master &&
184 git tag -m heavy heavy &&
185 test_must_fail git branch --track heavytrack heavy >actual &&
186 test_i18ngrep ! "set up to track" actual &&
187 test_must_fail git checkout heavytrack
190 test_expect_success
'setup tracking with branch --set-upstream on existing branch' '
191 git branch from-master master &&
192 test_must_fail git config branch.from-master.merge > actual &&
193 git branch --set-upstream from-master master &&
194 git config branch.from-master.merge > actual &&
195 grep -q "^refs/heads/master$" actual
198 test_expect_success
'--set-upstream does not change branch' '
199 git branch from-master2 master &&
200 test_must_fail git config branch.from-master2.merge > actual &&
201 git rev-list from-master2 &&
202 git update-ref refs/heads/from-master2 from-master2^ &&
203 git rev-parse from-master2 >expect2 &&
204 git branch --set-upstream from-master2 master &&
205 git config branch.from-master.merge > actual &&
206 git rev-parse from-master2 >actual2 &&
207 grep -q "^refs/heads/master$" actual &&
211 test_expect_success
'--set-upstream @{-1}' '
212 git checkout from-master &&
213 git checkout from-master2 &&
214 git config branch.from-master2.merge > expect2 &&
215 git branch --set-upstream @{-1} follower &&
216 git config branch.from-master.merge > actual &&
217 git config branch.from-master2.merge > actual2 &&
218 git branch --set-upstream from-master follower &&
219 git config branch.from-master.merge > expect &&
220 test_cmp expect2 actual2 &&
221 test_cmp expect actual