git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
ccde83bca4a4dccdfd27c64a924774aa107cfa40 blob 4977 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
 
#!/bin/sh

test_description='multi-pack-indexes'
. ./test-lib.sh

midx_read_expect() {
	NUM_PACKS=$1
	NUM_OBJECTS=$2
	NUM_CHUNKS=$3
	OBJECT_DIR=$4
	EXTRA_CHUNKS="$5"
	cat >expect <<- EOF
	header: 4d494458 1 $NUM_CHUNKS $NUM_PACKS
	chunks: pack_names oid_fanout oid_lookup object_offsets$EXTRA_CHUNKS
	num_objects: $NUM_OBJECTS
	packs:
	EOF
	if [ $NUM_PACKS -ge 1 ]
	then
		ls $OBJECT_DIR/pack/ | grep idx | sort >> expect
	fi
	printf "object_dir: $OBJECT_DIR\n" >>expect &&
	test-tool read-midx $OBJECT_DIR >actual &&
	test_cmp expect actual
}

test_expect_success 'write midx with no packs' '
	test_when_finished rm pack/multi-pack-index &&
	git multi-pack-index --object-dir=. write &&
	midx_read_expect 0 0 4 .
'

test_expect_success 'create objects' '
	for i in `test_seq 1 5`
	do
		iii=$(printf '%03i' $i)
		test-tool genrandom "bar" 200 > wide_delta_$iii &&
		test-tool genrandom "baz $iii" 50 >> wide_delta_$iii &&
		test-tool genrandom "foo"$i 100 > deep_delta_$iii &&
		test-tool genrandom "foo"$(expr $i + 1) 100 >> deep_delta_$iii &&
		test-tool genrandom "foo"$(expr $i + 2) 100 >> deep_delta_$iii &&
		echo $iii >file_$iii &&
		test-tool genrandom "$iii" 8192 >>file_$iii &&
		git update-index --add file_$iii deep_delta_$iii wide_delta_$iii &&
		i=$(expr $i + 1) || return 1
	done &&
	{ echo 101 && test-tool genrandom 100 8192; } >file_101 &&
	git update-index --add file_101 &&
	tree=$(git write-tree) &&
	commit=$(git commit-tree $tree </dev/null) && {
	echo $tree &&
	git ls-tree $tree | sed -e "s/.* \\([0-9a-f]*\\)	.*/\\1/"
	} >obj-list &&
	git update-ref HEAD $commit
'

test_expect_success 'write midx with one v1 pack' '
	pack=$(git pack-objects --index-version=1 pack/test <obj-list) &&
	test_when_finished rm pack/test-$pack.pack pack/test-$pack.idx pack/multi-pack-index &&
	git multi-pack-index --object-dir=. write &&
	midx_read_expect 1 17 4 .
'

test_expect_success 'write midx with one v2 pack' '
	git pack-objects --index-version=2,0x40 pack/test <obj-list &&
	git multi-pack-index --object-dir=. write &&
	midx_read_expect 1 17 4 .
'

test_expect_success 'Add more objects' '
	for i in `test_seq 6 10`
	do
		iii=$(printf '%03i' $i)
		test-tool genrandom "bar" 200 > wide_delta_$iii &&
		test-tool genrandom "baz $iii" 50 >> wide_delta_$iii &&
		test-tool genrandom "foo"$i 100 > deep_delta_$iii &&
		test-tool genrandom "foo"$(expr $i + 1) 100 >> deep_delta_$iii &&
		test-tool genrandom "foo"$(expr $i + 2) 100 >> deep_delta_$iii &&
		echo $iii >file_$iii &&
		test-tool genrandom "$iii" 8192 >>file_$iii &&
		git update-index --add file_$iii deep_delta_$iii wide_delta_$iii &&
		i=$(expr $i + 1) || return 1
	done &&
	{ echo 101 && test-tool genrandom 100 8192; } >file_101 &&
	git update-index --add file_101 &&
	tree=$(git write-tree) &&
	commit=$(git commit-tree $tree -p HEAD</dev/null) && {
	echo $tree &&
	git ls-tree $tree | sed -e "s/.* \\([0-9a-f]*\\)	.*/\\1/"
	} >obj-list2 &&
	git update-ref HEAD $commit
'

test_expect_success 'write midx with two packs' '
	git pack-objects --index-version=1 pack/test-2 <obj-list2 &&
	git multi-pack-index --object-dir=. write &&
	midx_read_expect 2 33 4 .
'

test_expect_success 'Add more packs' '
	for j in `test_seq 1 10`
	do
		iii=$(printf '%03i' $i)
		test-tool genrandom "bar" 200 > wide_delta_$iii &&
		test-tool genrandom "baz $iii" 50 >> wide_delta_$iii &&
		test-tool genrandom "foo"$i 100 > deep_delta_$iii &&
		test-tool genrandom "foo"$(expr $i + 1) 100 >> deep_delta_$iii &&
		test-tool genrandom "foo"$(expr $i + 2) 100 >> deep_delta_$iii &&
		echo $iii >file_$iii &&
		test-tool genrandom "$iii" 8192 >>file_$iii &&
		git update-index --add file_$iii deep_delta_$iii wide_delta_$iii &&
		{ echo 101 && test-tool genrandom 100 8192; } >file_101 &&
		git update-index --add file_101 &&
		tree=$(git write-tree) &&
		commit=$(git commit-tree $tree -p HEAD</dev/null) && {
		echo $tree &&
		git ls-tree $tree | sed -e "s/.* \\([0-9a-f]*\\)	.*/\\1/"
		} >obj-list &&
		git update-ref HEAD $commit &&
		git pack-objects --index-version=2 pack/test-pack <obj-list &&
		i=$(expr $i + 1) || return 1 &&
		j=$(expr $j + 1) || return 1
	done
'

test_expect_success 'write midx with twelve packs' '
	git multi-pack-index --object-dir=. write &&
	midx_read_expect 12 73 4 .
'


# usage: corrupt_data <file> <pos> [<data>]
corrupt_data() {
	file=$1
	pos=$2
	data="${3:-\0}"
	printf "$data" | dd of="$file" bs=1 seek="$pos" conv=notrunc
}

# Force 64-bit offsets by manipulating the idx file.
# This makes the IDX file _incorrect_ so be careful to clean up after!
test_expect_success 'force some 64-bit offsets with pack-objects' '
	mkdir objects64 &&
	mkdir objects64/pack &&
	pack64=$(git pack-objects --index-version=2,0x40 objects64/pack/test-64 <obj-list) &&
	idx64=objects64/pack/test-64-$pack64.idx &&
	chmod u+w $idx64 &&
	corrupt_data $idx64 2899 "\02" &&
	midx64=$(git multi-pack-index write --object-dir=objects64) &&
	midx_read_expect 1 62 5 objects64 " large_offsets"
'

test_done
debug log:

solving ccde83bca4 ...
found ccde83bca4 in https://public-inbox.org/git/20180625143434.89044-16-dstolee@microsoft.com/
found ad0d447522 in https://public-inbox.org/git/20180625143434.89044-15-dstolee@microsoft.com/
found 47e1c7d99e in https://public-inbox.org/git/20180625143434.89044-14-dstolee@microsoft.com/
found 800fa7749c in https://public-inbox.org/git/20180625143434.89044-12-dstolee@microsoft.com/
found 1b2778961c in https://public-inbox.org/git/20180625143434.89044-11-dstolee@microsoft.com/
found 4d4d6ca0a6 in https://public-inbox.org/git/20180625143434.89044-10-dstolee@microsoft.com/
found d533fd0dbc in https://public-inbox.org/git/20180625143434.89044-8-dstolee@microsoft.com/
found 0372704c96 in https://public-inbox.org/git/20180625143434.89044-7-dstolee@microsoft.com/
found 8622a7cdce in https://public-inbox.org/git/20180625143434.89044-6-dstolee@microsoft.com/ ||
	https://public-inbox.org/git/20180706005321.124643-6-dstolee@microsoft.com/
found ec3ddbe79c in git.git.git
preparing index
index prepared:
100755 ec3ddbe79cc13b129f63578fdcf0f2ccd4507e0a	t/t5319-multi-pack-index.sh

applying [1/10] https://public-inbox.org/git/20180625143434.89044-6-dstolee@microsoft.com/
diff --git a/t/t5319-multi-pack-index.sh b/t/t5319-multi-pack-index.sh
index ec3ddbe79c..8622a7cdce 100755

Checking patch t/t5319-multi-pack-index.sh...
Applied patch t/t5319-multi-pack-index.sh cleanly.

skipping https://public-inbox.org/git/20180706005321.124643-6-dstolee@microsoft.com/ for 8622a7cdce
index at:
100755 8622a7cdcee7002c38d922f17dd02c24bef32fe1	t/t5319-multi-pack-index.sh

applying [2/10] https://public-inbox.org/git/20180625143434.89044-7-dstolee@microsoft.com/
diff --git a/t/t5319-multi-pack-index.sh b/t/t5319-multi-pack-index.sh
index 8622a7cdce..0372704c96 100755


applying [3/10] https://public-inbox.org/git/20180625143434.89044-8-dstolee@microsoft.com/
diff --git a/t/t5319-multi-pack-index.sh b/t/t5319-multi-pack-index.sh
index 0372704c96..d533fd0dbc 100755


applying [4/10] https://public-inbox.org/git/20180625143434.89044-10-dstolee@microsoft.com/
diff --git a/t/t5319-multi-pack-index.sh b/t/t5319-multi-pack-index.sh
index d533fd0dbc..4d4d6ca0a6 100755


applying [5/10] https://public-inbox.org/git/20180625143434.89044-11-dstolee@microsoft.com/
diff --git a/t/t5319-multi-pack-index.sh b/t/t5319-multi-pack-index.sh
index 4d4d6ca0a6..1b2778961c 100755


applying [6/10] https://public-inbox.org/git/20180625143434.89044-12-dstolee@microsoft.com/
diff --git a/t/t5319-multi-pack-index.sh b/t/t5319-multi-pack-index.sh
index 1b2778961c..800fa7749c 100755


applying [7/10] https://public-inbox.org/git/20180625143434.89044-14-dstolee@microsoft.com/
diff --git a/t/t5319-multi-pack-index.sh b/t/t5319-multi-pack-index.sh
index 800fa7749c..47e1c7d99e 100755


applying [8/10] https://public-inbox.org/git/20180625143434.89044-15-dstolee@microsoft.com/
diff --git a/t/t5319-multi-pack-index.sh b/t/t5319-multi-pack-index.sh
index 47e1c7d99e..ad0d447522 100755


applying [9/10] https://public-inbox.org/git/20180625143434.89044-16-dstolee@microsoft.com/
diff --git a/t/t5319-multi-pack-index.sh b/t/t5319-multi-pack-index.sh
index ad0d447522..ccde83bca4 100755

Checking patch t/t5319-multi-pack-index.sh...
Applied patch t/t5319-multi-pack-index.sh cleanly.
Checking patch t/t5319-multi-pack-index.sh...
Applied patch t/t5319-multi-pack-index.sh cleanly.
Checking patch t/t5319-multi-pack-index.sh...
Applied patch t/t5319-multi-pack-index.sh cleanly.
Checking patch t/t5319-multi-pack-index.sh...
Applied patch t/t5319-multi-pack-index.sh cleanly.
Checking patch t/t5319-multi-pack-index.sh...
Applied patch t/t5319-multi-pack-index.sh cleanly.
Checking patch t/t5319-multi-pack-index.sh...
Applied patch t/t5319-multi-pack-index.sh cleanly.
Checking patch t/t5319-multi-pack-index.sh...
Applied patch t/t5319-multi-pack-index.sh cleanly.
Checking patch t/t5319-multi-pack-index.sh...
Applied patch t/t5319-multi-pack-index.sh cleanly.

index at:
100755 ccde83bca4a4dccdfd27c64a924774aa107cfa40	t/t5319-multi-pack-index.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).