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
|
#!/bin/sh
#
# Copyright (c) 2009, Red Hat Inc, Author: Michael S. Tsirkin (mst@redhat.com)
#
test_description='test clone --reference'
. ./test-lib.sh
base_dir=$(pwd)
test_alternate_is_used () {
alternates_file="$1" &&
working_dir="$2" &&
test_line_count = 1 "$alternates_file" &&
echo "0 objects, 0 kilobytes" >expect &&
git -C "$working_dir" count-objects >actual &&
test_cmp expect actual
}
test_expect_success 'preparing first repository' '
test_create_repo A &&
(
cd A &&
echo first >file1 &&
git add file1 &&
git commit -m A-initial
)
'
test_expect_success 'preparing second repository' '
git clone A B &&
(
cd B &&
echo second >file2 &&
git add file2 &&
git commit -m B-addition &&
git repack -a -d &&
git prune
)
'
test_expect_success 'preparing superproject' '
test_create_repo super &&
(
cd super &&
echo file >file &&
git add file &&
git commit -m B-super-initial
)
'
test_expect_success 'submodule add --reference uses alternates' '
(
cd super &&
git submodule add --reference ../B "file://$base_dir/A" sub &&
git commit -m B-super-added &&
git repack -ad
) &&
test_alternate_is_used super/.git/modules/sub/objects/info/alternates super/sub
'
test_expect_success 'submodule add --reference with --dissociate does not use alternates' '
(
cd super &&
git submodule add --reference ../B --dissociate "file://$base_dir/A" sub-dissociate &&
git commit -m B-super-added &&
git repack -ad
) &&
test_path_is_missing super/.git/modules/sub-dissociate/objects/info/alternates
'
test_expect_success 'that reference gets used with add' '
(
cd super/sub &&
echo "0 objects, 0 kilobytes" >expected &&
git count-objects >current &&
diff expected current
)
'
# The tests up to this point, and repositories created by them
# (A, B, super and super/sub), are about setting up the stage
# for subsequent tests and meant to be kept throughout the
# remainder of the test.
# Tests from here on, if they create their own test repository,
# are expected to clean after themselves.
test_expect_success 'updating superproject keeps alternates' '
test_when_finished "rm -rf super-clone" &&
git clone super super-clone &&
git -C super-clone submodule update --init --reference ../B &&
test_alternate_is_used super-clone/.git/modules/sub/objects/info/alternates super-clone/sub
'
test_expect_success 'updating superproject with --dissociate does not keep alternates' '
test_when_finished "rm -rf super-clone" &&
git clone super super-clone &&
git -C super-clone submodule update --init --reference ../B --dissociate &&
test_path_is_missing super-clone/.git/modules/sub/objects/info/alternates
'
test_expect_success 'submodules use alternates when cloning a superproject' '
test_when_finished "rm -rf super-clone" &&
git clone --reference super --recursive super super-clone &&
(
cd super-clone &&
# test superproject has alternates setup correctly
test_alternate_is_used .git/objects/info/alternates . &&
# test submodule has correct setup
test_alternate_is_used .git/modules/sub/objects/info/alternates sub
)
'
test_expect_success 'missing submodule alternate fails clone and submodule update' '
test_when_finished "rm -rf super-clone" &&
git clone super super2 &&
test_must_fail git clone --recursive --reference super2 super2 super-clone &&
(
cd super-clone &&
# test superproject has alternates setup correctly
test_alternate_is_used .git/objects/info/alternates . &&
# update of the submodule succeeds
test_must_fail git submodule update --init &&
# and we have no alternates:
test_path_is_missing .git/modules/sub/objects/info/alternates &&
test_path_is_missing sub/file1
)
'
test_expect_success 'ignoring missing submodule alternates passes clone and submodule update' '
test_when_finished "rm -rf super-clone" &&
git clone --reference-if-able super2 --recursive super2 super-clone &&
(
cd super-clone &&
# test superproject has alternates setup correctly
test_alternate_is_used .git/objects/info/alternates . &&
# update of the submodule succeeds
git submodule update --init &&
# and we have no alternates:
test_path_is_missing .git/modules/sub/objects/info/alternates &&
test_path_is_file sub/file1
)
'
test_expect_success 'preparing second superproject with a nested submodule plus partial clone' '
test_create_repo supersuper &&
(
cd supersuper &&
echo "I am super super." >file &&
git add file &&
git commit -m B-super-super-initial &&
git submodule add "file://$base_dir/super" subwithsub &&
git commit -m B-super-super-added &&
git submodule update --init --recursive &&
git repack -ad
) &&
git clone supersuper supersuper2 &&
(
cd supersuper2 &&
git submodule update --init
)
'
# At this point there are three root-level positories: A, B, super and super2
test_expect_success 'nested submodule alternate in works and is actually used' '
test_when_finished "rm -rf supersuper-clone" &&
git clone --recursive --reference supersuper supersuper supersuper-clone &&
(
cd supersuper-clone &&
# test superproject has alternates setup correctly
test_alternate_is_used .git/objects/info/alternates . &&
# immediate submodule has alternate:
test_alternate_is_used .git/modules/subwithsub/objects/info/alternates subwithsub &&
# nested submodule also has alternate:
test_alternate_is_used .git/modules/subwithsub/modules/sub/objects/info/alternates subwithsub/sub
)
'
check_that_two_of_three_alternates_are_used() {
test_alternate_is_used .git/objects/info/alternates . &&
# immediate submodule has alternate:
test_alternate_is_used .git/modules/subwithsub/objects/info/alternates subwithsub &&
# but nested submodule has no alternate:
test_path_is_missing .git/modules/subwithsub/modules/sub/objects/info/alternates
}
test_expect_success 'missing nested submodule alternate fails clone and submodule update' '
test_when_finished "rm -rf supersuper-clone" &&
test_must_fail git clone --recursive --reference supersuper2 supersuper2 supersuper-clone &&
(
cd supersuper-clone &&
check_that_two_of_three_alternates_are_used &&
# update of the submodule fails
cat >expect <<-\EOF &&
fatal: submodule '\''sub'\'' cannot add alternate: path ... does not exist
Failed to clone '\''sub'\''. Retry scheduled
fatal: submodule '\''sub-dissociate'\'' cannot add alternate: path ... does not exist
Failed to clone '\''sub-dissociate'\''. Retry scheduled
fatal: submodule '\''sub'\'' cannot add alternate: path ... does not exist
Failed to clone '\''sub'\'' a second time, aborting
fatal: Failed to recurse into submodule path ...
EOF
test_must_fail git submodule update --init --recursive 2>err &&
grep -e fatal: -e ^Failed err >actual.raw &&
sed -e "s/path $SQ[^$SQ]*$SQ/path .../" <actual.raw >actual &&
test_cmp expect actual
)
'
test_expect_success 'missing nested submodule alternate in --reference-if-able mode' '
test_when_finished "rm -rf supersuper-clone" &&
git clone --recursive --reference-if-able supersuper2 supersuper2 supersuper-clone &&
(
cd supersuper-clone &&
check_that_two_of_three_alternates_are_used &&
# update of the submodule succeeds
git submodule update --init --recursive
)
'
test_done
|
