git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / Atom feed
4469128203da83bde564041ae5f217155d7de311 blob 5374 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
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
 
#!/bin/sh
#
# Copyright (c) 2018 Jiang Xin
#

test_description='git pack-redundant test'

. ./test-lib.sh

create_commits () {
	parent=
	for name in A B C D E F G H I J K L M N O P Q R
	do
		test_tick &&
		T=$(git write-tree) &&
		if test -z "$parent"
		then
			oid=$(echo $name | git commit-tree $T)
		else
			oid=$(echo $name | git commit-tree -p $parent $T)
		fi &&
		eval $name=$oid &&
		parent=$oid ||
		return 1
	done
	git update-ref refs/heads/master $R
}

create_pack_1 () {
	P1=$(git -C objects/pack pack-objects -q pack <<-EOF
		$T
		$A
		$B
		$C
		$D
		$E
		$F
		$R
		EOF
	) &&
	eval P$P1=P1:$P1
}

create_pack_2 () {
	P2=$(git -C objects/pack pack-objects -q pack <<-EOF
		$B
		$C
		$D
		$E
		$G
		$H
		$I
		EOF
	) &&
	eval P$P2=P2:$P2
}

create_pack_3 () {
	P3=$(git -C objects/pack pack-objects -q pack <<-EOF
		$F
		$I
		$J
		$K
		$L
		$M
		EOF
	) &&
	eval P$P3=P3:$P3
}

create_pack_4 () {
	P4=$(git -C objects/pack pack-objects -q pack <<-EOF
		$J
		$K
		$L
		$M
		$P
		EOF
	) &&
	eval P$P4=P4:$P4
}

create_pack_5 () {
	P5=$(git -C objects/pack pack-objects -q pack <<-EOF
		$G
		$H
		$N
		$O
		EOF
	) &&
	eval P$P5=P5:$P5
}

create_pack_6 () {
	P6=$(git -C objects/pack pack-objects -q pack <<-EOF
		$N
		$O
		$Q
		EOF
	) &&
	eval P$P6=P6:$P6
}

create_pack_7 () {
	P7=$(git -C objects/pack pack-objects -q pack <<-EOF
		$P
		$Q
		EOF
	) &&
	eval P$P7=P7:$P7
}

create_pack_8 () {
	P8=$(git -C objects/pack pack-objects -q pack <<-EOF
		$A
		EOF
	) &&
	eval P$P8=P8:$P8
}

format_packfiles () {
	sed \
		-e "s#.*/pack-\(.*\)\.idx#\1#" \
		-e "s#.*/pack-\(.*\)\.pack#\1#" |
	sort -u |
	while read p
	do
		if test -z "$(eval echo \${P$p})"
		then
			echo $p
		else
			eval echo "\${P$p}"
		fi
	done |
	sort
}

test_expect_success 'setup master.git' '
	git init --bare master.git &&
	cd master.git &&
	create_commits
'

test_expect_success 'no redundant for pack 1, 2, 3' '
	create_pack_1 && create_pack_2 && create_pack_3 &&
	git pack-redundant --all >out &&
	test_must_be_empty out
'

test_expect_success 'create pack 4, 5' '
	create_pack_4 && create_pack_5
'

cat >expected <<EOF
P3:$P3
EOF

test_expect_success 'one of pack-2/pack-3 is redundant' '
	git pack-redundant --all >out &&
	format_packfiles <out >actual &&
	test_cmp expected actual
'

test_expect_success 'create pack 6, 7' '
	create_pack_6 && create_pack_7
'

# Only after calling create_pack_6, we can use $P6 variable.
cat >expected <<EOF
P2:$P2
P4:$P4
P6:$P6
EOF

test_expect_success 'pack 2, 4, and 6 are redundant' '
	git pack-redundant --all >out &&
	format_packfiles <out >actual &&
	test_cmp expected actual
'

test_expect_success 'create pack 8' '
	create_pack_8
'

cat >expected <<EOF
P2:$P2
P4:$P4
P6:$P6
P8:$P8
EOF

test_expect_success 'pack-8 (subset of pack-1) is also redundant' '
	git pack-redundant --all >out &&
	format_packfiles <out >actual &&
	test_cmp expected actual
'

test_expect_success 'clean loose objects' '
	git prune-packed &&
	find objects -type f | sed -e "/objects\/pack\//d" >out &&
	test_must_be_empty out
'

test_expect_success 'remove redundant packs and pass fsck' '
	git pack-redundant --all | xargs rm &&
	git fsck --no-progress &&
	git pack-redundant --all >out &&
	test_must_be_empty out
'

test_expect_success 'setup shared.git' '
	cd "$TRASH_DIRECTORY" &&
	git clone -q --mirror master.git shared.git &&
	cd shared.git &&
	printf "../../master.git/objects" >objects/info/alternates
'

test_expect_success 'no redundant packs without --alt-odb' '
	git pack-redundant --all >out &&
	test_must_be_empty out
'

cat >expected <<EOF
P1:$P1
P3:$P3
P5:$P5
P7:$P7
EOF

test_expect_success 'pack-redundant --verbose: show duplicate packs in stderr' '
	git pack-redundant --all --verbose >out 2>out.err &&
	test_must_be_empty out &&
	grep "pack$" out.err | format_packfiles >actual &&
	test_cmp expected actual
'

cat >expected <<EOF
fatal: Zero packs found!
EOF

test_expect_success 'remove redundant packs by alt-odb, no packs left' '
	git pack-redundant --all --alt-odb | xargs rm &&
	git fsck --no-progress &&
	test_must_fail git pack-redundant --all --alt-odb >actual 2>&1 &&
	test_cmp expected actual
'

create_commits_others () {
	parent=$(git rev-parse HEAD)
	for name in X Y Z
	do
		test_tick &&
		T=$(git write-tree) &&
		if test -z "$parent"
		then
			oid=$(echo $name | git commit-tree $T)
		else
			oid=$(echo $name | git commit-tree -p $parent $T)
		fi &&
		eval $name=$oid &&
		parent=$oid ||
		return 1
	done
	git update-ref refs/heads/master $Z
}

create_pack_x1 () {
	Px1=$(git -C objects/pack pack-objects -q pack <<-EOF
		$X
		$Y
		$Z
		$A
		$B
		$C
		EOF
	) &&
	eval P${Px1}=Px1:${Px1}
}

create_pack_x2 () {
	Px2=$(git -C objects/pack pack-objects -q pack <<-EOF
		$X
		$Y
		$Z
		$D
		$E
		$F
		EOF
	) &&
	eval P${Px2}=Px2:${Px2}
}

test_expect_success 'new objects and packs in shared.git' '
	create_commits_others &&
	create_pack_x1 &&
	create_pack_x2 &&
	git pack-redundant --all >out &&
	test_must_be_empty out
'

test_expect_success 'one pack is redundant' '
	git pack-redundant --all --alt-odb >out &&
	format_packfiles <out >actual &&
	test_line_count = 1 actual
'

cat >expected <<EOF
Px1:$Px1
Px2:$Px2
EOF

test_expect_success 'set ignore objects and all two packs are redundant' '
	git pack-redundant --all --alt-odb >out <<-EOF &&
		$X
		$Y
		$Z
		EOF
	format_packfiles <out >actual &&
	test_cmp expected actual
'

test_done
debug log:

solving 4469128203 ...
found 4469128203 in https://public-inbox.org/git/20190130114736.30357-7-worldhello.net@gmail.com/
found d176a6eb91 in https://public-inbox.org/git/20190130114736.30357-4-worldhello.net@gmail.com/
found 710fe9884c in https://public-inbox.org/git/20190130114736.30357-2-worldhello.net@gmail.com/

applying [1/3] https://public-inbox.org/git/20190130114736.30357-2-worldhello.net@gmail.com/
diff --git a/t/t5323-pack-redundant.sh b/t/t5323-pack-redundant.sh
new file mode 100755
index 0000000000..710fe9884c


applying [2/3] https://public-inbox.org/git/20190130114736.30357-4-worldhello.net@gmail.com/
diff --git a/t/t5323-pack-redundant.sh b/t/t5323-pack-redundant.sh
index 710fe9884c..d176a6eb91 100755


applying [3/3] https://public-inbox.org/git/20190130114736.30357-7-worldhello.net@gmail.com/
diff --git a/t/t5323-pack-redundant.sh b/t/t5323-pack-redundant.sh
index d176a6eb91..4469128203 100755

Checking patch t/t5323-pack-redundant.sh...
Applied patch t/t5323-pack-redundant.sh cleanly.
Checking patch t/t5323-pack-redundant.sh...
Applied patch t/t5323-pack-redundant.sh cleanly.
Checking patch t/t5323-pack-redundant.sh...
Applied patch t/t5323-pack-redundant.sh cleanly.

index at:
100755 4469128203da83bde564041ae5f217155d7de311	t/t5323-pack-redundant.sh

git@vger.kernel.org list mirror (unofficial, one of many)

Archives are clonable:
	git clone --mirror https://public-inbox.org/git
	git clone --mirror http://ou63pmih66umazou.onion/git
	git clone --mirror http://czquwvybam4bgbro.onion/git
	git clone --mirror http://hjrcffqmbrq6wope.onion/git

Newsgroups are available over NNTP:
	nntp://news.public-inbox.org/inbox.comp.version-control.git
	nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git
	nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git
	nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git
	nntp://news.gmane.org/gmane.comp.version-control.git

 note: .onion URLs require Tor: https://www.torproject.org/

AGPL code for this site: git clone https://public-inbox.org/ public-inbox