]>
Commit | Line | Data |
---|---|---|
1 | #!/bin/sh | |
2 | ||
3 | test_description='remote tracking stats' | |
4 | ||
5 | . ./test-lib.sh | |
6 | ||
7 | advance () { | |
8 | echo "$1" >"$1" && | |
9 | git add "$1" && | |
10 | test_tick && | |
11 | git commit -m "$1" | |
12 | } | |
13 | ||
14 | test_expect_success setup ' | |
15 | advance a && | |
16 | advance b && | |
17 | advance c && | |
18 | 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 && | |
30 | advance f && | |
31 | git checkout -b brokenbase origin && | |
32 | git checkout -b b5 --track brokenbase && | |
33 | advance g && | |
34 | git branch -d brokenbase && | |
35 | git checkout -b b6 origin | |
36 | ) && | |
37 | git checkout -b follower --track master && | |
38 | advance h | |
39 | ' | |
40 | ||
41 | script='s/^..\(b.\) *[0-9a-f]* \(.*\)$/\1 \2/p' | |
42 | cat >expect <<\EOF | |
43 | b1 [ahead 1, behind 1] d | |
44 | b2 [ahead 1, behind 1] d | |
45 | b3 [behind 1] b | |
46 | b4 [ahead 2] f | |
47 | b5 [gone] g | |
48 | b6 c | |
49 | EOF | |
50 | ||
51 | test_expect_success 'branch -v' ' | |
52 | ( | |
53 | cd test && | |
54 | git branch -v | |
55 | ) | | |
56 | sed -n -e "$script" >actual && | |
57 | test_i18ncmp expect actual | |
58 | ' | |
59 | ||
60 | cat >expect <<\EOF | |
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 | |
66 | b6 [origin/master] c | |
67 | EOF | |
68 | ||
69 | test_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 | ||
78 | test_expect_success 'checkout (diverged from upstream)' ' | |
79 | ( | |
80 | cd test && git checkout b1 | |
81 | ) >actual && | |
82 | test_i18ngrep "have 1 and 1 different" actual | |
83 | ' | |
84 | ||
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 | |
89 | ' | |
90 | ||
91 | test_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 | ||
99 | test_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 | ||
106 | test_expect_success 'status (diverged from upstream)' ' | |
107 | ( | |
108 | cd test && | |
109 | git checkout b1 >/dev/null && | |
110 | # reports nothing to commit | |
111 | test_must_fail git commit --dry-run | |
112 | ) >actual && | |
113 | test_i18ngrep "have 1 and 1 different" actual | |
114 | ' | |
115 | ||
116 | test_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 | ||
126 | test_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 | ||
136 | cat >expect <<\EOF | |
137 | ## b1...origin/master [ahead 1, behind 1] | |
138 | EOF | |
139 | ||
140 | test_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 | ||
149 | cat >expect <<\EOF | |
150 | ## b5...brokenbase [gone] | |
151 | EOF | |
152 | ||
153 | test_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 | ||
162 | cat >expect <<\EOF | |
163 | ## b6...origin/master | |
164 | EOF | |
165 | ||
166 | test_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 | ||
175 | test_expect_success 'fail to track lightweight tags' ' | |
176 | git checkout master && | |
177 | git tag light && | |
178 | test_must_fail git branch --track lighttrack light >actual && | |
179 | test_i18ngrep ! "set up to track" actual && | |
180 | test_must_fail git checkout lighttrack | |
181 | ' | |
182 | ||
183 | test_expect_success 'fail to track annotated tags' ' | |
184 | git checkout master && | |
185 | git tag -m heavy heavy && | |
186 | test_must_fail git branch --track heavytrack heavy >actual && | |
187 | test_i18ngrep ! "set up to track" actual && | |
188 | test_must_fail git checkout heavytrack | |
189 | ' | |
190 | ||
191 | test_expect_success '--set-upstream-to does not change branch' ' | |
192 | git branch from-master master && | |
193 | git branch --set-upstream-to master from-master && | |
194 | git branch from-master2 master && | |
195 | test_must_fail git config branch.from-master2.merge > actual && | |
196 | git rev-list from-master2 && | |
197 | git update-ref refs/heads/from-master2 from-master2^ && | |
198 | git rev-parse from-master2 >expect2 && | |
199 | git branch --set-upstream-to master from-master2 && | |
200 | git config branch.from-master.merge > actual && | |
201 | git rev-parse from-master2 >actual2 && | |
202 | grep -q "^refs/heads/master$" actual && | |
203 | cmp expect2 actual2 | |
204 | ' | |
205 | ||
206 | test_expect_success '--set-upstream-to @{-1}' ' | |
207 | git checkout follower && | |
208 | git checkout from-master2 && | |
209 | git config branch.from-master2.merge > expect2 && | |
210 | git branch --set-upstream-to @{-1} from-master && | |
211 | git config branch.from-master.merge > actual && | |
212 | git config branch.from-master2.merge > actual2 && | |
213 | git branch --set-upstream-to follower from-master && | |
214 | git config branch.from-master.merge > expect && | |
215 | test_cmp expect2 actual2 && | |
216 | test_cmp expect actual | |
217 | ' | |
218 | ||
219 | test_done |