git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
d1ec594f6a5f6d3f2aac02bef19c85b9d02e19c9 blob 5920 bytes (raw)

  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
 
#!/bin/sh

test_description='branch --contains <commit>, --no-contains <commit> --merged, and --no-merged'

. ./test-lib.sh

test_expect_success setup '

	>file &&
	git add file &&
	test_tick &&
	git commit -m initial &&
	git branch side &&

	echo 1 >file &&
	test_tick &&
	git commit -a -m "second on master" &&

	git checkout side &&
	echo 1 >file &&
	test_tick &&
	git commit -a -m "second on side" &&

	git merge master

'

test_expect_success 'branch --contains=master' '

	git branch --contains=master >actual &&
	{
		echo "  master" && echo "* side"
	} >expect &&
	test_cmp expect actual

'

test_expect_success 'branch --contains master' '

	git branch --contains master >actual &&
	{
		echo "  master" && echo "* side"
	} >expect &&
	test_cmp expect actual

'

test_expect_success 'branch --no-contains=master' '

	git branch --no-contains=master >actual &&
	test_must_be_empty actual

'

test_expect_success 'branch --no-contains master' '

	git branch --no-contains master >actual &&
	test_must_be_empty actual

'

test_expect_success 'branch --contains=side' '

	git branch --contains=side >actual &&
	{
		echo "* side"
	} >expect &&
	test_cmp expect actual

'

test_expect_success 'branch --no-contains=side' '

	git branch --no-contains=side >actual &&
	{
		echo "  master"
	} >expect &&
	test_cmp expect actual

'

test_expect_success 'branch --contains with pattern implies --list' '

	git branch --contains=master master >actual &&
	{
		echo "  master"
	} >expect &&
	test_cmp expect actual

'

test_expect_success 'branch --no-contains with pattern implies --list' '

	git branch --no-contains=master master >actual &&
	test_must_be_empty actual

'

test_expect_success 'side: branch --merged' '

	git branch --merged >actual &&
	{
		echo "  master" &&
		echo "* side"
	} >expect &&
	test_cmp expect actual

'

test_expect_success 'branch --merged with pattern implies --list' '

	git branch --merged=side master >actual &&
	{
		echo "  master"
	} >expect &&
	test_cmp expect actual

'

test_expect_success 'side: branch --no-merged' '

	git branch --no-merged >actual &&
	test_must_be_empty actual

'

test_expect_success 'master: branch --merged' '

	git checkout master &&
	git branch --merged >actual &&
	{
		echo "* master"
	} >expect &&
	test_cmp expect actual

'

test_expect_success 'master: branch --no-merged' '

	git branch --no-merged >actual &&
	{
		echo "  side"
	} >expect &&
	test_cmp expect actual

'

test_expect_success 'branch --no-merged with pattern implies --list' '

	git branch --no-merged=master master >actual &&
	test_must_be_empty actual

'

test_expect_success 'implicit --list conflicts with modification options' '

	test_must_fail git branch --contains=master -d &&
	test_must_fail git branch --contains=master -m foo &&
	test_must_fail git branch --no-contains=master -d &&
	test_must_fail git branch --no-contains=master -m foo

'

test_expect_success 'Assert that --contains only works on commits, not trees & blobs' '
	test_must_fail git branch --contains master^{tree} &&
	blob=$(git hash-object -w --stdin <<-\EOF
	Some blob
	EOF
	) &&
	test_must_fail git branch --contains $blob &&
	test_must_fail git branch --no-contains $blob
'

# We want to set up a case where the walk for the tracking info
# of one branch crosses the tip of another branch (and make sure
# that the latter walk does not mess up our flag to see if it was
# merged).
#
# Here "topic" tracks "master" with one extra commit, and "zzz" points to the
# same tip as master The name "zzz" must come alphabetically after "topic"
# as we process them in that order.
test_expect_success 'branch --merged with --verbose' '
	git branch --track topic master &&
	git branch zzz topic &&
	git checkout topic &&
	test_commit foo &&
	git branch --merged topic >actual &&
	cat >expect <<-\EOF &&
	  master
	* topic
	  zzz
	EOF
	test_cmp expect actual &&
	git branch --verbose --merged topic >actual &&
	cat >expect <<-EOF &&
	  master $(git rev-parse --short master) second on master
	* topic  $(git rev-parse --short topic ) [ahead 1] foo
	  zzz    $(git rev-parse --short zzz   ) second on master
	EOF
	test_i18ncmp expect actual
'

# The next series of tests covers multiple filter combinations
test_expect_success 'set up repo for multiple filter combination tests' '
	git checkout master &&
	git branch | grep -v master | xargs git branch -D &&
	git checkout -b feature_a master &&
	>feature_a &&
	git add feature_a &&
	git commit -m "add feature a" &&
	git checkout -b feature_b master &&
	>feature_b &&
	git add feature_b &&
	git commit -m "add feature b"
'

test_expect_success 'multiple branch --contains' '
	git checkout -b next master &&
	git merge feature_a &&
	git branch --contains feature_a --contains feature_b >actual &&
	cat >expect <<-\EOF &&
	  feature_a
	  feature_b
	* next
	EOF
	test_cmp expect actual
'

test_expect_success 'multiple branch --merged' '
	git branch --merged next --merged master >actual &&
	cat >expect <<-\EOF &&
	  feature_a
	  master
	* next
	EOF
	test_cmp expect actual
'

test_expect_success 'multiple branch --no-contains' '
	git branch --no-contains feature_a --no-contains feature_b >actual &&
	cat >expect <<-\EOF &&
	  master
	EOF
	test_cmp expect actual
'

test_expect_success 'multiple branch --no-merged' '
	git branch --no-merged next --no-merged master >actual &&
	cat >expect <<-\EOF &&
	  feature_b
	EOF
	test_cmp expect actual
'

test_expect_success 'branch --contains combined with --no-contains' '
	git checkout master &&
	git merge feature_a &&
	git checkout next &&
	git merge feature_b &&
	git branch --contains feature_a --no-contains feature_b >actual &&
	cat >expect <<-\EOF &&
	  feature_a
	  master
	EOF
	test_cmp expect actual
'

test_expect_success 'branch --merged combined with --no-merged' '
	git branch --merged next --no-merged master >actual &&
	cat >expect <<-\EOF &&
	  feature_b
	* next
	EOF
	test_cmp expect actual
'

test_done
debug log:

solving d1ec594f6a ...
found d1ec594f6a in https://public-inbox.org/git/20200911185754.64173-3-alipman88@gmail.com/ ||
	https://public-inbox.org/git/20200913193140.66906-4-alipman88@gmail.com/
found cd205b5560 in https://public-inbox.org/git/20200913193140.66906-2-alipman88@gmail.com/ ||
	https://public-inbox.org/git/20200911185754.64173-2-alipman88@gmail.com/
found 40251c9f8f in https://80x24.org/mirrors/git.git
preparing index
index prepared:
100755 40251c9f8f68cbfba145976eb912ecdd3364dc65	t/t3201-branch-contains.sh

applying [1/4] https://public-inbox.org/git/20200913193140.66906-2-alipman88@gmail.com/
diff --git a/t/t3201-branch-contains.sh b/t/t3201-branch-contains.sh
index 40251c9f8f..cd205b5560 100755

Checking patch t/t3201-branch-contains.sh...
Applied patch t/t3201-branch-contains.sh cleanly.

skipping https://public-inbox.org/git/20200911185754.64173-2-alipman88@gmail.com/ for cd205b5560
index at:
100755 cd205b5560005a425fa2fbe879dc6dece537e0e6	t/t3201-branch-contains.sh

applying [2/4] https://public-inbox.org/git/20200911185754.64173-3-alipman88@gmail.com/
diff --git a/t/t3201-branch-contains.sh b/t/t3201-branch-contains.sh
index cd205b5560..d1ec594f6a 100755

Checking patch t/t3201-branch-contains.sh...
Applied patch t/t3201-branch-contains.sh cleanly.

skipping https://public-inbox.org/git/20200913193140.66906-4-alipman88@gmail.com/ for d1ec594f6a
index at:
100755 d1ec594f6a5f6d3f2aac02bef19c85b9d02e19c9	t/t3201-branch-contains.sh

Code repositories for project(s) associated with this inbox:

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).