3 test_description='remote tracking stats'
14 test_expect_success setup '
21 git checkout -b b1 origin &&
22 git reset --hard HEAD^ &&
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 &&
31 git checkout -b brokenbase origin &&
32 git checkout -b b5 --track brokenbase &&
34 git branch -d brokenbase &&
35 git checkout -b b6 origin
37 git checkout -b follower --track master &&
41 script='s/^..\(b.\) *[0-9a-f]* \(.*\)$/\1 \2/p'
43 b1 [ahead 1, behind 1] d
44 b2 [ahead 1, behind 1] d
51 test_expect_success 'branch -v' '
56 sed -n -e "$script" >actual &&
57 test_i18ncmp expect actual
61 b1 [origin/master: ahead 1, behind 1] d
62 b2 [origin/master: ahead 1, behind 1] d
63 b3 [origin/master: behind 1] b
64 b4 [origin/master: ahead 2] f
65 b5 [brokenbase: gone] g
69 test_expect_success 'branch -vv' '
74 sed -n -e "$script" >actual &&
75 test_i18ncmp expect actual
78 test_expect_success 'checkout (diverged from upstream)' '
80 cd test && git checkout b1
82 test_i18ngrep "have 1 and 1 different" actual
85 test_expect_success 'checkout with local tracked branch' '
86 git checkout master &&
87 git checkout follower >actual &&
88 test_i18ngrep "is ahead of" actual
91 test_expect_success 'checkout (upstream is gone)' '
96 test_i18ngrep "is based on .*, but the upstream is gone." actual
99 test_expect_success 'checkout (up-to-date with upstream)' '
101 cd test && git checkout b6
103 test_i18ngrep "Your branch is up to date with .origin/master" actual
106 test_expect_success 'status (diverged from upstream)' '
109 git checkout b1 >/dev/null &&
110 # reports nothing to commit
111 test_must_fail git commit --dry-run
113 test_i18ngrep "have 1 and 1 different" actual
116 test_expect_success 'status (upstream is gone)' '
119 git checkout b5 >/dev/null &&
120 # reports nothing to commit
121 test_must_fail git commit --dry-run
123 test_i18ngrep "is based on .*, but the upstream is gone." actual
126 test_expect_success 'status (up-to-date with upstream)' '
129 git checkout b6 >/dev/null &&
130 # reports nothing to commit
131 test_must_fail git commit --dry-run
133 test_i18ngrep "Your branch is up to date with .origin/master" actual
137 ## b1...origin/master [ahead 1, behind 1]
140 test_expect_success 'status -s -b (diverged from upstream)' '
143 git checkout b1 >/dev/null &&
144 git status -s -b | head -1
146 test_i18ncmp expect actual
150 ## b1...origin/master [different]
153 test_expect_success 'status -s -b --no-ahead-behind (diverged from upstream)' '
156 git checkout b1 >/dev/null &&
157 git status -s -b --no-ahead-behind | head -1
159 test_i18ncmp expect actual
163 ## b5...brokenbase [gone]
166 test_expect_success 'status -s -b (upstream is gone)' '
169 git checkout b5 >/dev/null &&
170 git status -s -b | head -1
172 test_i18ncmp expect actual
176 ## b6...origin/master
179 test_expect_success 'status -s -b (up-to-date with upstream)' '
182 git checkout b6 >/dev/null &&
183 git status -s -b | head -1
185 test_i18ncmp expect actual
188 test_expect_success 'fail to track lightweight tags' '
189 git checkout master &&
191 test_must_fail git branch --track lighttrack light >actual &&
192 test_i18ngrep ! "set up to track" actual &&
193 test_must_fail git checkout lighttrack
196 test_expect_success 'fail to track annotated tags' '
197 git checkout master &&
198 git tag -m heavy heavy &&
199 test_must_fail git branch --track heavytrack heavy >actual &&
200 test_i18ngrep ! "set up to track" actual &&
201 test_must_fail git checkout heavytrack
204 test_expect_success '--set-upstream-to does not change branch' '
205 git branch from-master master &&
206 git branch --set-upstream-to master from-master &&
207 git branch from-master2 master &&
208 test_must_fail git config branch.from-master2.merge > actual &&
209 git rev-list from-master2 &&
210 git update-ref refs/heads/from-master2 from-master2^ &&
211 git rev-parse from-master2 >expect2 &&
212 git branch --set-upstream-to master from-master2 &&
213 git config branch.from-master.merge > actual &&
214 git rev-parse from-master2 >actual2 &&
215 grep -q "^refs/heads/master$" actual &&
219 test_expect_success '--set-upstream-to @{-1}' '
220 git checkout follower &&
221 git checkout from-master2 &&
222 git config branch.from-master2.merge > expect2 &&
223 git branch --set-upstream-to @{-1} from-master &&
224 git config branch.from-master.merge > actual &&
225 git config branch.from-master2.merge > actual2 &&
226 git branch --set-upstream-to follower from-master &&
227 git config branch.from-master.merge > expect &&
228 test_cmp expect2 actual2 &&
229 test_cmp expect actual