summaryrefslogtreecommitdiff
path: root/t/t3202-show-branch.sh
blob: a1139f79e2ccfdff2b562571bdd8bdf8aa974883 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
#!/bin/sh
 
test_description='test show-branch'
 
. ./test-lib.sh
 
test_expect_success 'error descriptions on empty repository' '
	current=$(git branch --show-current) &&
	cat >expect <<-EOF &&
	error: no commit on branch '\''$current'\'' yet
	EOF
	test_must_fail git branch --edit-description 2>actual &&
	test_cmp expect actual &&
	test_must_fail git branch --edit-description $current 2>actual &&
	test_cmp expect actual
'
 
test_expect_success 'fatal descriptions on empty repository' '
	current=$(git branch --show-current) &&
	cat >expect <<-EOF &&
	fatal: no commit on branch '\''$current'\'' yet
	EOF
	test_must_fail git branch --set-upstream-to=non-existent 2>actual &&
	test_cmp expect actual &&
	test_must_fail git branch -c new-branch 2>actual &&
	test_cmp expect actual
'
 
test_expect_success 'setup' '
	test_commit initial &&
	for i in $(test_seq 1 10)
	do
		git checkout -b branch$i initial &&
		test_commit --no-tag branch$i || return 1
	done &&
	git for-each-ref \
		--sort=version:refname \
		--format="%(refname:strip=2)" \
		"refs/heads/branch*" >branches.sorted &&
	sed "s/^> //" >expect <<-\EOF
	> ! [branch1] branch1
	>  ! [branch2] branch2
	>   ! [branch3] branch3
	>    ! [branch4] branch4
	>     ! [branch5] branch5
	>      ! [branch6] branch6
	>       ! [branch7] branch7
	>        ! [branch8] branch8
	>         ! [branch9] branch9
	>          * [branch10] branch10
	> ----------
	>          * [branch10] branch10
	>         +  [branch9] branch9
	>        +   [branch8] branch8
	>       +    [branch7] branch7
	>      +     [branch6] branch6
	>     +      [branch5] branch5
	>    +       [branch4] branch4
	>   +        [branch3] branch3
	>  +         [branch2] branch2
	> +          [branch1] branch1
	> +++++++++* [branch10^] initial
	EOF
'
 
test_expect_success 'show-branch with more than 8 branches' '
	git show-branch $(cat branches.sorted) >actual &&
	test_cmp expect actual
'
 
test_expect_success 'show-branch with showbranch.default' '
	for branch in $(cat branches.sorted)
	do
		test_config showbranch.default $branch --add || return 1
	done &&
	git show-branch >actual &&
	test_cmp expect actual
'
 
test_expect_success 'show-branch --color output' '
	sed "s/^> //" >expect <<-\EOF &&
	> <RED>!<RESET> [branch1] branch1
	>  <GREEN>!<RESET> [branch2] branch2
	>   <YELLOW>!<RESET> [branch3] branch3
	>    <BLUE>!<RESET> [branch4] branch4
	>     <MAGENTA>!<RESET> [branch5] branch5
	>      <CYAN>!<RESET> [branch6] branch6
	>       <BOLD;RED>!<RESET> [branch7] branch7
	>        <BOLD;GREEN>!<RESET> [branch8] branch8
	>         <BOLD;YELLOW>!<RESET> [branch9] branch9
	>          <BOLD;BLUE>*<RESET> [branch10] branch10
	> ----------
	>          <BOLD;BLUE>*<RESET> [branch10] branch10
	>         <BOLD;YELLOW>+<RESET>  [branch9] branch9
	>        <BOLD;GREEN>+<RESET>   [branch8] branch8
	>       <BOLD;RED>+<RESET>    [branch7] branch7
	>      <CYAN>+<RESET>     [branch6] branch6
	>     <MAGENTA>+<RESET>      [branch5] branch5
	>    <BLUE>+<RESET>       [branch4] branch4
	>   <YELLOW>+<RESET>        [branch3] branch3
	>  <GREEN>+<RESET>         [branch2] branch2
	> <RED>+<RESET>          [branch1] branch1
	> <RED>+<RESET><GREEN>+<RESET><YELLOW>+<RESET><BLUE>+<RESET><MAGENTA>+<RESET><CYAN>+<RESET><BOLD;RED>+<RESET><BOLD;GREEN>+<RESET><BOLD;YELLOW>+<RESET><BOLD;BLUE>*<RESET> [branch10^] initial
	EOF
	git show-branch --color=always $(cat branches.sorted) >actual.raw &&
	test_decode_color <actual.raw >actual &&
	test_cmp expect actual
'
 
test_expect_success 'show branch --remotes' '
	cat >expect.err <<-\EOF &&
	No revs to be shown.
	EOF
	git show-branch -r 2>actual.err >actual.out &&
	test_cmp expect.err actual.err &&
	test_must_be_empty actual.out
'
 
test_expect_success 'show-branch --sparse' '
	test_when_finished "git checkout branch10 && git branch -D branchA" &&
	git checkout -b branchA branch10 &&
	git merge -s ours -m "merge 1 and 10 to make A" branch1 &&
	git commit --allow-empty -m "another" &&
 
	git show-branch --sparse >out &&
	grep "merge 1 and 10 to make A" out &&
 
	git show-branch >out &&
	! grep "merge 1 and 10 to make A" out &&
 
	git show-branch --no-sparse >out &&
	! grep "merge 1 and 10 to make A" out
'
 
test_expect_success 'setup show branch --list' '
	sed "s/^> //" >expect <<-\EOF
	>   [branch1] branch1
	>   [branch2] branch2
	>   [branch3] branch3
	>   [branch4] branch4
	>   [branch5] branch5
	>   [branch6] branch6
	>   [branch7] branch7
	>   [branch8] branch8
	>   [branch9] branch9
	> * [branch10] branch10
	EOF
'
 
test_expect_success 'show branch --list' '
	git show-branch --list $(cat branches.sorted) >actual &&
	test_cmp expect actual
'
 
test_expect_success 'show branch --list has no --color output' '
	git show-branch --color=always --list $(cat branches.sorted) >actual &&
	test_cmp expect actual
'
 
test_expect_success 'show branch --merge-base with one argument' '
	for branch in $(cat branches.sorted)
	do
		git rev-parse $branch >expect &&
		git show-branch --merge-base $branch >actual &&
		test_cmp expect actual || return 1
	done
'
 
test_expect_success 'show branch --merge-base with two arguments' '
	for branch in $(cat branches.sorted)
	do
		git rev-parse initial >expect &&
		git show-branch --merge-base initial $branch >actual &&
		test_cmp expect actual || return 1
	done
'
 
test_expect_success 'show branch --merge-base with N arguments' '
	git rev-parse initial >expect &&
	git show-branch --merge-base $(cat branches.sorted) >actual &&
	test_cmp expect actual &&
 
	git merge-base $(cat branches.sorted) >actual &&
	test_cmp expect actual
'
 
# incompatible options
while read combo
do
	test_expect_success "show-branch $combo (should fail)" '
		test_must_fail git show-branch $combo 2>error &&
		grep -e "cannot be used together" -e "usage:" error
	'
done <<\EOF
--all --reflog
--merge-base --reflog
--list --merge-base
--reflog --current
EOF
 
# unnegatable options
for opt in topo-order date-order reflog
do
	test_expect_success "show-branch --no-$opt (should fail)" '
		test_must_fail git show-branch --no-$opt 2>err &&
		grep "unknown option .no-$opt." err
	'
done
 
test_expect_success 'error descriptions on non-existent branch' '
	cat >expect <<-EOF &&
	error: no branch named '\''non-existent'\''
	EOF
	test_must_fail git branch --edit-description non-existent 2>actual &&
	test_cmp expect actual
'
 
test_expect_success 'fatal descriptions on non-existent branch' '
	cat >expect <<-EOF &&
	fatal: branch '\''non-existent'\'' does not exist
	EOF
	test_must_fail git branch --set-upstream-to=non-existent non-existent 2>actual &&
	test_cmp expect actual &&
 
	cat >expect <<-EOF &&
	fatal: no branch named '\''non-existent'\''
	EOF
	test_must_fail git branch -c non-existent new-branch 2>actual &&
	test_cmp expect actual &&
	test_must_fail git branch -m non-existent new-branch 2>actual &&
	test_cmp expect actual
'
 
test_expect_success 'error descriptions on orphan branch' '
	test_when_finished git worktree remove -f wt &&
	git worktree add wt --detach &&
	git -C wt checkout --orphan orphan-branch &&
	test_branch_op_in_wt() {
		test_orphan_error() {
			test_must_fail git $* 2>actual &&
			test_grep "no commit on branch .orphan-branch. yet$" actual
		} &&
		test_orphan_error -C wt branch $1 $2 &&                # implicit branch
		test_orphan_error -C wt branch $1 orphan-branch $2 &&  # explicit branch
		test_orphan_error branch $1 orphan-branch $2           # different worktree
	} &&
	test_branch_op_in_wt --edit-description &&
	test_branch_op_in_wt --set-upstream-to=ne &&
	test_branch_op_in_wt -c new-branch
'
 
test_expect_success 'setup reflogs' '
	test_commit base &&
	git checkout -b branch &&
	test_commit one &&
	git reset --hard HEAD^ &&
	test_commit two &&
	test_commit three
'
 
test_expect_success '--reflog shows reflog entries' '
	cat >expect <<-\EOF &&
	! [branch@{0}] (0 seconds ago) commit: three
	 ! [branch@{1}] (60 seconds ago) commit: two
	  ! [branch@{2}] (2 minutes ago) reset: moving to HEAD^
	   ! [branch@{3}] (2 minutes ago) commit: one
	----
	+    [branch@{0}] three
	++   [branch@{1}] two
	   + [branch@{3}] one
	++++ [branch@{2}] base
	EOF
	# the output always contains relative timestamps; use
	# a known time to get deterministic results
	GIT_TEST_DATE_NOW=$test_tick \
	git show-branch --reflog branch >actual &&
	test_cmp expect actual
'
 
test_expect_success '--reflog handles missing reflog' '
	git reflog expire --expire=now branch &&
	git show-branch --reflog branch >actual &&
	test_must_be_empty actual
'
 
test_done