blob: cb1b8e35dbfa65d92636da5f9737c0ec8a1e26aa [file] [log] [blame]
Lars Hjemli88961ef2007-06-02 03:27:42 +02001#!/bin/sh
2#
3# Copyright (c) 2007 Lars Hjemli
4#
5
6test_description='Basic porcelain support for submodules
7
8This test tries to verify basic sanity of the init, update and status
Nanako Shiraishi47a528a2008-09-03 17:59:33 +09009subcommands of git submodule.
Lars Hjemli88961ef2007-06-02 03:27:42 +020010'
11
Johannes Schindelin01dc8132020-11-18 23:44:39 +000012GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
Johannes Schindelin334afbc2020-11-18 23:44:19 +000013export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
14
Lars Hjemli88961ef2007-06-02 03:27:42 +020015. ./test-lib.sh
16
Stefan Bellerf6a52792016-05-05 12:52:32 -070017test_expect_success 'submodule deinit works on empty repository' '
18 git submodule deinit --all
19'
20
Jonathan Niederfe454b12010-04-10 00:38:37 -050021test_expect_success 'setup - initial commit' '
22 >t &&
Nanako Shiraishi47a528a2008-09-03 17:59:33 +090023 git add t &&
24 git commit -m "initial commit" &&
Jonathan Niederfe454b12010-04-10 00:38:37 -050025 git branch initial
26'
27
Stefan Bellerd92028a2016-04-28 13:02:45 -070028test_expect_success 'submodule init aborts on missing .gitmodules file' '
29 test_when_finished "git update-index --remove sub" &&
30 git update-index --add --cacheinfo 160000,$(git rev-parse HEAD),sub &&
31 # missing the .gitmodules file here
32 test_must_fail git submodule init 2>actual &&
33 test_i18ngrep "No url found for submodule path" actual
34'
35
Stefan Beller08fdbdb2016-04-28 13:02:46 -070036test_expect_success 'submodule update aborts on missing .gitmodules file' '
37 test_when_finished "git update-index --remove sub" &&
38 git update-index --add --cacheinfo 160000,$(git rev-parse HEAD),sub &&
39 # missing the .gitmodules file here
40 git submodule update sub 2>actual &&
41 test_i18ngrep "Submodule path .sub. not initialized" actual
42'
43
Jeff King627fde12017-04-24 20:57:47 -040044test_expect_success 'submodule update aborts on missing gitmodules url' '
45 test_when_finished "git update-index --remove sub" &&
46 git update-index --add --cacheinfo 160000,$(git rev-parse HEAD),sub &&
47 test_when_finished "rm -f .gitmodules" &&
48 git config -f .gitmodules submodule.s.path sub &&
49 test_must_fail git submodule init
50'
51
Kyle Meyere1381112019-04-09 19:07:35 -040052test_expect_success 'add aborts on repository with no commits' '
53 cat >expect <<-\EOF &&
Atharva Raykar0008d122021-07-10 13:17:59 +053054 fatal: '"'repo-no-commits'"' does not have a commit checked out
Kyle Meyere1381112019-04-09 19:07:35 -040055 EOF
56 git init repo-no-commits &&
57 test_must_fail git submodule add ../a ./repo-no-commits 2>actual &&
Ævar Arnfjörð Bjarmason1108cea2021-02-11 02:53:53 +010058 test_cmp expect actual
Kyle Meyere1381112019-04-09 19:07:35 -040059'
60
Peter Kaestlef38c9242020-02-03 00:32:44 +010061test_expect_success 'status should ignore inner git repo when not added' '
62 rm -fr inner &&
63 mkdir inner &&
64 (
65 cd inner &&
66 git init &&
67 >t &&
68 git add t &&
69 git commit -m "initial"
70 ) &&
71 test_must_fail git submodule status inner 2>output.err &&
72 rm -fr inner &&
73 test_i18ngrep "^error: .*did not match any file(s) known to git" output.err
74'
75
Jonathan Niederfe454b12010-04-10 00:38:37 -050076test_expect_success 'setup - repository in init subdirectory' '
Junio C Hamanoa2d93ae2008-01-15 03:13:55 -080077 mkdir init &&
Jonathan Niederfe454b12010-04-10 00:38:37 -050078 (
79 cd init &&
80 git init &&
81 echo a >a &&
82 git add a &&
83 git commit -m "submodule commit 1" &&
84 git tag -a -m "rev-1" rev-1
85 )
Jonathan Niederfe454b12010-04-10 00:38:37 -050086'
87
88test_expect_success 'setup - commit with gitlink' '
Lars Hjemli88961ef2007-06-02 03:27:42 +020089 echo a >a &&
90 echo z >z &&
Junio C Hamanoa2d93ae2008-01-15 03:13:55 -080091 git add a init z &&
Jonathan Niederfe454b12010-04-10 00:38:37 -050092 git commit -m "super commit 1"
93'
94
95test_expect_success 'setup - hide init subdirectory' '
96 mv init .subrepo
97'
98
Jonathan Niedera76c9442010-04-10 00:39:04 -050099test_expect_success 'setup - repository to add submodules to' '
Ævar Arnfjörð Bjarmason31991b02010-07-05 17:33:03 +0000100 git init addtest &&
101 git init addtest-ignore
Michael J Gruberac8463d2009-03-03 16:08:20 +0100102'
103
Jonathan Niedera76c9442010-04-10 00:39:04 -0500104# The 'submodule add' tests need some repository to add as a submodule.
Jeff Kingdd008b32011-07-30 09:05:54 -0600105# The trash directory is a good one as any. We need to canonicalize
106# the name, though, as some tests compare it to the absolute path git
107# generates, which will expand symbolic links.
108submodurl=$(pwd -P)
Jonathan Niedera76c9442010-04-10 00:39:04 -0500109
110listbranches() {
111 git for-each-ref --format='%(refname)' 'refs/heads/*'
112}
113
114inspect() {
115 dir=$1 &&
116 dotdot="${2:-..}" &&
117
118 (
119 cd "$dir" &&
120 listbranches >"$dotdot/heads" &&
121 { git symbolic-ref HEAD || :; } >"$dotdot/head" &&
Jonathan Niederce8b54d2010-04-10 00:39:41 -0500122 git rev-parse HEAD >"$dotdot/head-sha1" &&
Jonathan Niedera76c9442010-04-10 00:39:04 -0500123 git update-index --refresh &&
124 git diff-files --exit-code &&
125 git clean -n -d -x >"$dotdot/untracked"
126 )
127}
128
Michael J Gruberac8463d2009-03-03 16:08:20 +0100129test_expect_success 'submodule add' '
Johannes Schindelin01dc8132020-11-18 23:44:39 +0000130 echo "refs/heads/main" >expect &&
Jonathan Niedera76c9442010-04-10 00:39:04 -0500131
Michael J Gruberac8463d2009-03-03 16:08:20 +0100132 (
133 cd addtest &&
Jens Lehmann7e604072011-07-26 23:39:03 +0200134 git submodule add -q "$submodurl" submod >actual &&
Junio C Hamanoca8d1482013-06-09 11:29:20 -0700135 test_must_be_empty actual &&
Jens Lehmannea115a02012-03-04 22:14:30 +0100136 echo "gitdir: ../.git/modules/submod" >expect &&
137 test_cmp expect submod/.git &&
Jens Lehmannd75219b2012-03-04 22:15:08 +0100138 (
139 cd submod &&
140 git config core.worktree >actual &&
141 echo "../../../submod" >expect &&
142 test_cmp expect actual &&
143 rm -f actual expect
144 ) &&
Michael J Gruberac8463d2009-03-03 16:08:20 +0100145 git submodule init
Jonathan Niedera76c9442010-04-10 00:39:04 -0500146 ) &&
147
148 rm -f heads head untracked &&
149 inspect addtest/submod ../.. &&
150 test_cmp expect heads &&
151 test_cmp expect head &&
SZEDER Gábor1c5e94f2018-08-19 23:57:25 +0200152 test_must_be_empty untracked
Michael J Gruberac8463d2009-03-03 16:08:20 +0100153'
154
Stefan Beller83f5fa52018-06-18 16:41:48 -0700155test_expect_success 'setup parent and one repository' '
156 test_create_repo parent &&
157 test_commit -C parent one
158'
Casey Fitzpatrick6d33e1c2018-05-03 06:53:45 -0400159
160test_expect_success 'redirected submodule add does not show progress' '
161 git -C addtest submodule add "file://$submodurl/parent" submod-redirected \
162 2>err &&
163 ! grep % err &&
164 test_i18ngrep ! "Checking connectivity" err
165'
166
167test_expect_success 'redirected submodule add --progress does show progress' '
168 git -C addtest submodule add --progress "file://$submodurl/parent" \
169 submod-redirected-progress 2>err && \
170 grep % err
171'
172
Jens Lehmannd27b8762010-07-17 17:11:43 +0200173test_expect_success 'submodule add to .gitignored path fails' '
Ævar Arnfjörð Bjarmason31991b02010-07-05 17:33:03 +0000174 (
175 cd addtest-ignore &&
Jens Lehmannd27b8762010-07-17 17:11:43 +0200176 cat <<-\EOF >expect &&
Kyle Meyerc8163852020-01-07 19:31:21 -0500177 The following paths are ignored by one of your .gitignore files:
Jens Lehmannd27b8762010-07-17 17:11:43 +0200178 submod
Junio C Hamanodaef1b32020-02-14 12:54:19 -0800179 hint: Use -f if you really want to add them.
180 hint: Turn this message off by running
181 hint: "git config advice.addIgnoredFile false"
Jens Lehmannd27b8762010-07-17 17:11:43 +0200182 EOF
Ævar Arnfjörð Bjarmason31991b02010-07-05 17:33:03 +0000183 # Does not use test_commit due to the ignore
184 echo "*" > .gitignore &&
185 git add --force .gitignore &&
186 git commit -m"Ignore everything" &&
Jens Lehmannd27b8762010-07-17 17:11:43 +0200187 ! git submodule add "$submodurl" submod >actual 2>&1 &&
Ævar Arnfjörð Bjarmason1108cea2021-02-11 02:53:53 +0100188 test_cmp expect actual
Jens Lehmannd27b8762010-07-17 17:11:43 +0200189 )
190'
Ævar Arnfjörð Bjarmason31991b02010-07-05 17:33:03 +0000191
Jens Lehmannd27b8762010-07-17 17:11:43 +0200192test_expect_success 'submodule add to .gitignored path with --force' '
193 (
194 cd addtest-ignore &&
195 git submodule add --force "$submodurl" submod
196 )
Ævar Arnfjörð Bjarmason31991b02010-07-05 17:33:03 +0000197'
198
Atharva Raykar84069fc2021-07-06 23:49:34 +0530199test_expect_success 'submodule add to path with tracked content fails' '
200 (
201 cd addtest &&
Atharva Raykar0008d122021-07-10 13:17:59 +0530202 echo "fatal: '\''dir-tracked'\'' already exists in the index" >expect &&
Atharva Raykar84069fc2021-07-06 23:49:34 +0530203 mkdir dir-tracked &&
204 test_commit foo dir-tracked/bar &&
205 test_must_fail git submodule add "$submodurl" dir-tracked >actual 2>&1 &&
206 test_cmp expect actual
207 )
208'
209
Stefan Beller619acfc2016-10-06 12:37:24 -0700210test_expect_success 'submodule add to reconfigure existing submodule with --force' '
211 (
212 cd addtest-ignore &&
Eric Sunshineadc73312018-07-01 20:23:51 -0400213 bogus_url="$(pwd)/bogus-url" &&
214 git submodule add --force "$bogus_url" submod &&
215 git submodule add --force -b initial "$submodurl" submod-branch &&
216 test "$bogus_url" = "$(git config -f .gitmodules submodule.submod.url)" &&
217 test "$bogus_url" = "$(git config submodule.submod.url)" &&
Stefan Beller619acfc2016-10-06 12:37:24 -0700218 # Restore the url
Eric Sunshineadc73312018-07-01 20:23:51 -0400219 git submodule add --force "$submodurl" submod &&
Stefan Beller619acfc2016-10-06 12:37:24 -0700220 test "$submodurl" = "$(git config -f .gitmodules submodule.submod.url)" &&
221 test "$submodurl" = "$(git config submodule.submod.url)"
222 )
223'
224
Kyle Meyerc8163852020-01-07 19:31:21 -0500225test_expect_success 'submodule add relays add --dry-run stderr' '
226 test_when_finished "rm -rf addtest/.git/index.lock" &&
227 (
228 cd addtest &&
229 : >.git/index.lock &&
230 ! git submodule add "$submodurl" sub-while-locked 2>output.err &&
231 test_i18ngrep "^fatal: .*index\.lock" output.err &&
232 test_path_is_missing sub-while-locked
233 )
234'
235
Ben Jacksonea10b602009-04-18 20:42:07 -0700236test_expect_success 'submodule add --branch' '
Jonathan Niedera76c9442010-04-10 00:39:04 -0500237 echo "refs/heads/initial" >expect-head &&
238 cat <<-\EOF >expect-heads &&
239 refs/heads/initial
Johannes Schindelin01dc8132020-11-18 23:44:39 +0000240 refs/heads/main
Jonathan Niedera76c9442010-04-10 00:39:04 -0500241 EOF
Jonathan Niedera76c9442010-04-10 00:39:04 -0500242
Ben Jacksonea10b602009-04-18 20:42:07 -0700243 (
244 cd addtest &&
245 git submodule add -b initial "$submodurl" submod-branch &&
W. Trevor Kingb9289222012-12-19 11:03:33 -0500246 test "initial" = "$(git config -f .gitmodules submodule.submod-branch.branch)" &&
Jonathan Niedera76c9442010-04-10 00:39:04 -0500247 git submodule init
248 ) &&
249
250 rm -f heads head untracked &&
251 inspect addtest/submod-branch ../.. &&
252 test_cmp expect-heads heads &&
253 test_cmp expect-head head &&
SZEDER Gábor1c5e94f2018-08-19 23:57:25 +0200254 test_must_be_empty untracked
Ben Jacksonea10b602009-04-18 20:42:07 -0700255'
256
Michael J Gruberdb75ada2009-03-03 16:08:21 +0100257test_expect_success 'submodule add with ./ in path' '
Johannes Schindelin01dc8132020-11-18 23:44:39 +0000258 echo "refs/heads/main" >expect &&
Jonathan Niedera76c9442010-04-10 00:39:04 -0500259
Michael J Gruberac8463d2009-03-03 16:08:20 +0100260 (
261 cd addtest &&
262 git submodule add "$submodurl" ././dotsubmod/./frotz/./ &&
263 git submodule init
Jonathan Niedera76c9442010-04-10 00:39:04 -0500264 ) &&
265
266 rm -f heads head untracked &&
267 inspect addtest/dotsubmod/frotz ../../.. &&
268 test_cmp expect heads &&
269 test_cmp expect head &&
SZEDER Gábor1c5e94f2018-08-19 23:57:25 +0200270 test_must_be_empty untracked
Michael J Gruberac8463d2009-03-03 16:08:20 +0100271'
272
Patrick Steinhardt8196e722015-01-30 16:14:03 +0100273test_expect_success 'submodule add with /././ in path' '
Johannes Schindelin01dc8132020-11-18 23:44:39 +0000274 echo "refs/heads/main" >expect &&
Patrick Steinhardt8196e722015-01-30 16:14:03 +0100275
276 (
277 cd addtest &&
278 git submodule add "$submodurl" dotslashdotsubmod/././frotz/./ &&
279 git submodule init
280 ) &&
281
282 rm -f heads head untracked &&
283 inspect addtest/dotslashdotsubmod/frotz ../../.. &&
284 test_cmp expect heads &&
285 test_cmp expect head &&
SZEDER Gábor1c5e94f2018-08-19 23:57:25 +0200286 test_must_be_empty untracked
Patrick Steinhardt8196e722015-01-30 16:14:03 +0100287'
288
Michael J Gruberdb75ada2009-03-03 16:08:21 +0100289test_expect_success 'submodule add with // in path' '
Johannes Schindelin01dc8132020-11-18 23:44:39 +0000290 echo "refs/heads/main" >expect &&
Jonathan Niedera76c9442010-04-10 00:39:04 -0500291
Michael J Gruberac8463d2009-03-03 16:08:20 +0100292 (
293 cd addtest &&
294 git submodule add "$submodurl" slashslashsubmod///frotz// &&
295 git submodule init
Jonathan Niedera76c9442010-04-10 00:39:04 -0500296 ) &&
297
298 rm -f heads head untracked &&
299 inspect addtest/slashslashsubmod/frotz ../../.. &&
300 test_cmp expect heads &&
301 test_cmp expect head &&
SZEDER Gábor1c5e94f2018-08-19 23:57:25 +0200302 test_must_be_empty untracked
Michael J Gruberac8463d2009-03-03 16:08:20 +0100303'
304
Michael J Gruberdb75ada2009-03-03 16:08:21 +0100305test_expect_success 'submodule add with /.. in path' '
Johannes Schindelin01dc8132020-11-18 23:44:39 +0000306 echo "refs/heads/main" >expect &&
Jonathan Niedera76c9442010-04-10 00:39:04 -0500307
Michael J Gruberac8463d2009-03-03 16:08:20 +0100308 (
309 cd addtest &&
310 git submodule add "$submodurl" dotdotsubmod/../realsubmod/frotz/.. &&
311 git submodule init
Jonathan Niedera76c9442010-04-10 00:39:04 -0500312 ) &&
313
314 rm -f heads head untracked &&
315 inspect addtest/realsubmod ../.. &&
316 test_cmp expect heads &&
317 test_cmp expect head &&
SZEDER Gábor1c5e94f2018-08-19 23:57:25 +0200318 test_must_be_empty untracked
Michael J Gruberac8463d2009-03-03 16:08:20 +0100319'
320
Michael J Gruberdb75ada2009-03-03 16:08:21 +0100321test_expect_success 'submodule add with ./, /.. and // in path' '
Johannes Schindelin01dc8132020-11-18 23:44:39 +0000322 echo "refs/heads/main" >expect &&
Jonathan Niedera76c9442010-04-10 00:39:04 -0500323
Michael J Gruberac8463d2009-03-03 16:08:20 +0100324 (
325 cd addtest &&
326 git submodule add "$submodurl" dot/dotslashsubmod/./../..////realsubmod2/a/b/c/d/../../../../frotz//.. &&
327 git submodule init
Jonathan Niedera76c9442010-04-10 00:39:04 -0500328 ) &&
329
330 rm -f heads head untracked &&
331 inspect addtest/realsubmod2 ../.. &&
332 test_cmp expect heads &&
333 test_cmp expect head &&
SZEDER Gábor1c5e94f2018-08-19 23:57:25 +0200334 test_must_be_empty untracked
Michael J Gruberac8463d2009-03-03 16:08:20 +0100335'
336
Ramsay Jones7f1b2252017-04-30 18:29:30 +0100337test_expect_success !CYGWIN 'submodule add with \\ in path' '
Brandon Williamscf9e55f2017-04-07 10:23:06 -0700338 test_when_finished "rm -rf parent sub\\with\\backslash" &&
339
340 # Initialize a repo with a backslash in its name
341 git init sub\\with\\backslash &&
342 touch sub\\with\\backslash/empty.file &&
343 git -C sub\\with\\backslash add empty.file &&
344 git -C sub\\with\\backslash commit -m "Added empty.file" &&
345
346 # Add that repository as a submodule
347 git init parent &&
348 git -C parent submodule add ../sub\\with\\backslash
349'
350
John Keeping091a6eb2013-06-16 15:18:18 +0100351test_expect_success 'submodule add in subdirectory' '
Johannes Schindelin01dc8132020-11-18 23:44:39 +0000352 echo "refs/heads/main" >expect &&
John Keeping091a6eb2013-06-16 15:18:18 +0100353
354 mkdir addtest/sub &&
355 (
356 cd addtest/sub &&
357 git submodule add "$submodurl" ../realsubmod3 &&
358 git submodule init
359 ) &&
360
361 rm -f heads head untracked &&
362 inspect addtest/realsubmod3 ../.. &&
363 test_cmp expect heads &&
364 test_cmp expect head &&
SZEDER Gábor1c5e94f2018-08-19 23:57:25 +0200365 test_must_be_empty untracked
John Keeping091a6eb2013-06-16 15:18:18 +0100366'
367
368test_expect_success 'submodule add in subdirectory with relative path should fail' '
369 (
370 cd addtest/sub &&
371 test_must_fail git submodule add ../../ submod3 2>../../output.err
372 ) &&
373 test_i18ngrep toplevel output.err
374'
375
Jonathan Niederce8b54d2010-04-10 00:39:41 -0500376test_expect_success 'setup - add an example entry to .gitmodules' '
Jeff Kingf7e87142014-03-20 19:17:01 -0400377 git config --file=.gitmodules submodule.example.url git://example.com/init.git
Jonathan Niederce8b54d2010-04-10 00:39:41 -0500378'
379
Lars Hjemli941987a2007-06-11 21:12:24 +0200380test_expect_success 'status should fail for unmapped paths' '
Jonathan Niederce8b54d2010-04-10 00:39:41 -0500381 test_must_fail git submodule status
382'
383
384test_expect_success 'setup - map path in .gitmodules' '
385 cat <<\EOF >expect &&
386[submodule "example"]
387 url = git://example.com/init.git
388 path = init
389EOF
390
Jeff Kingf7e87142014-03-20 19:17:01 -0400391 git config --file=.gitmodules submodule.example.path init &&
Jonathan Niederce8b54d2010-04-10 00:39:41 -0500392
393 test_cmp expect .gitmodules
Lars Hjemli88961ef2007-06-02 03:27:42 +0200394'
395
396test_expect_success 'status should only print one line' '
Jonathan Niederce8b54d2010-04-10 00:39:41 -0500397 git submodule status >lines &&
Stefano Lattarini3fb04592012-04-11 13:24:01 +0200398 test_line_count = 1 lines
Jonathan Niederce8b54d2010-04-10 00:39:41 -0500399'
400
Manish Goregaokar1f3aea22019-11-25 04:15:44 +0000401test_expect_success 'status from subdirectory should have the same SHA1' '
402 test_when_finished "rmdir addtest/subdir" &&
403 (
404 cd addtest &&
405 mkdir subdir &&
406 git submodule status >output &&
407 awk "{print \$1}" <output >expect &&
408 cd subdir &&
409 git submodule status >../output &&
410 awk "{print \$1}" <../output >../actual &&
411 test_cmp ../expect ../actual &&
412 git -C ../submod checkout HEAD^ &&
413 git submodule status >../output &&
414 awk "{print \$1}" <../output >../actual2 &&
415 cd .. &&
416 git submodule status >output &&
417 awk "{print \$1}" <output >expect2 &&
418 test_cmp expect2 actual2 &&
419 ! test_cmp actual actual2
420 )
421'
422
Jonathan Niederce8b54d2010-04-10 00:39:41 -0500423test_expect_success 'setup - fetch commit name from submodule' '
424 rev1=$(cd .subrepo && git rev-parse HEAD) &&
425 printf "rev1: %s\n" "$rev1" &&
426 test -n "$rev1"
Lars Hjemli88961ef2007-06-02 03:27:42 +0200427'
428
429test_expect_success 'status should initially be "missing"' '
Jonathan Niederce8b54d2010-04-10 00:39:41 -0500430 git submodule status >lines &&
431 grep "^-$rev1" lines
Lars Hjemli88961ef2007-06-02 03:27:42 +0200432'
433
Lars Hjemli211b7f12007-06-06 11:13:02 +0200434test_expect_success 'init should register submodule url in .git/config' '
Jonathan Niederce8b54d2010-04-10 00:39:41 -0500435 echo git://example.com/init.git >expect &&
436
Nanako Shiraishi47a528a2008-09-03 17:59:33 +0900437 git submodule init &&
Jonathan Niederce8b54d2010-04-10 00:39:41 -0500438 git config submodule.example.url >url &&
439 git config submodule.example.url ./.subrepo &&
440
441 test_cmp expect url
Lars Hjemli211b7f12007-06-06 11:13:02 +0200442'
443
Peter Kaestle3b2885e2020-01-24 11:34:04 +0100444test_expect_success 'status should still be "missing" after initializing' '
Peter Kaestleace912b2020-01-24 11:34:03 +0100445 rm -fr init &&
446 mkdir init &&
447 git submodule status >lines &&
448 rm -fr init &&
449 grep "^-$rev1" lines
450'
451
Heiko Voigtbe9d0a32012-08-14 22:35:27 +0200452test_failure_with_unknown_submodule () {
453 test_must_fail git submodule $1 no-such-submodule 2>output.err &&
Nguyễn Thái Ngọc Duya80897c2018-07-21 09:49:30 +0200454 test_i18ngrep "^error: .*no-such-submodule" output.err
Heiko Voigtbe9d0a32012-08-14 22:35:27 +0200455}
456
457test_expect_success 'init should fail with unknown submodule' '
458 test_failure_with_unknown_submodule init
459'
460
461test_expect_success 'update should fail with unknown submodule' '
462 test_failure_with_unknown_submodule update
463'
464
465test_expect_success 'status should fail with unknown submodule' '
466 test_failure_with_unknown_submodule status
467'
468
469test_expect_success 'sync should fail with unknown submodule' '
470 test_failure_with_unknown_submodule sync
471'
472
Lars Hjemli211b7f12007-06-06 11:13:02 +0200473test_expect_success 'update should fail when path is used by a file' '
Jonathan Niederce8b54d2010-04-10 00:39:41 -0500474 echo hello >expect &&
475
Junio C Hamanoa2d93ae2008-01-15 03:13:55 -0800476 echo "hello" >init &&
Jonathan Niederce8b54d2010-04-10 00:39:41 -0500477 test_must_fail git submodule update &&
478
479 test_cmp expect init
Lars Hjemli88961ef2007-06-02 03:27:42 +0200480'
481
Lars Hjemli211b7f12007-06-06 11:13:02 +0200482test_expect_success 'update should fail when path is used by a nonempty directory' '
Jonathan Niederce8b54d2010-04-10 00:39:41 -0500483 echo hello >expect &&
484
485 rm -fr init &&
Junio C Hamanoa2d93ae2008-01-15 03:13:55 -0800486 mkdir init &&
487 echo "hello" >init/a &&
Jonathan Niederce8b54d2010-04-10 00:39:41 -0500488
489 test_must_fail git submodule update &&
490
491 test_cmp expect init/a
Lars Hjemli88961ef2007-06-02 03:27:42 +0200492'
493
Lars Hjemli211b7f12007-06-06 11:13:02 +0200494test_expect_success 'update should work when path is an empty dir' '
Jonathan Niederce8b54d2010-04-10 00:39:41 -0500495 rm -fr init &&
496 rm -f head-sha1 &&
497 echo "$rev1" >expect &&
498
Junio C Hamanoa2d93ae2008-01-15 03:13:55 -0800499 mkdir init &&
Jens Lehmann7e604072011-07-26 23:39:03 +0200500 git submodule update -q >update.out &&
Junio C Hamanoca8d1482013-06-09 11:29:20 -0700501 test_must_be_empty update.out &&
Jonathan Niederce8b54d2010-04-10 00:39:41 -0500502
503 inspect init &&
504 test_cmp expect head-sha1
Lars Hjemli88961ef2007-06-02 03:27:42 +0200505'
506
Lars Hjemli211b7f12007-06-06 11:13:02 +0200507test_expect_success 'status should be "up-to-date" after update' '
Jonathan Niederce8b54d2010-04-10 00:39:41 -0500508 git submodule status >list &&
509 grep "^ $rev1" list
Lars Hjemli88961ef2007-06-02 03:27:42 +0200510'
511
John Keeping091a6eb2013-06-16 15:18:18 +0100512test_expect_success 'status "up-to-date" from subdirectory' '
513 mkdir -p sub &&
514 (
515 cd sub &&
516 git submodule status >../list
517 ) &&
518 grep "^ $rev1" list &&
519 grep "\\.\\./init" list
520'
521
522test_expect_success 'status "up-to-date" from subdirectory with path' '
523 mkdir -p sub &&
524 (
525 cd sub &&
526 git submodule status ../init >../list
527 ) &&
528 grep "^ $rev1" list &&
529 grep "\\.\\./init" list
530'
531
Lars Hjemli88961ef2007-06-02 03:27:42 +0200532test_expect_success 'status should be "modified" after submodule commit' '
Jonathan Niederce8b54d2010-04-10 00:39:41 -0500533 (
534 cd init &&
535 echo b >b &&
536 git add b &&
537 git commit -m "submodule commit 2"
538 ) &&
539
540 rev2=$(cd init && git rev-parse HEAD) &&
541 test -n "$rev2" &&
542 git submodule status >list &&
543
544 grep "^+$rev2" list
Lars Hjemli88961ef2007-06-02 03:27:42 +0200545'
546
547test_expect_success 'the --cached sha1 should be rev1' '
Jonathan Niederce8b54d2010-04-10 00:39:41 -0500548 git submodule --cached status >list &&
549 grep "^+$rev1" list
Lars Hjemli88961ef2007-06-02 03:27:42 +0200550'
551
Sven Verdoolaege57011152007-09-08 12:30:22 +0200552test_expect_success 'git diff should report the SHA1 of the new submodule commit' '
Jonathan Niederce8b54d2010-04-10 00:39:41 -0500553 git diff >diff &&
554 grep "^+Subproject commit $rev2" diff
Sven Verdoolaege57011152007-09-08 12:30:22 +0200555'
556
Lars Hjemli88961ef2007-06-02 03:27:42 +0200557test_expect_success 'update should checkout rev1' '
Jonathan Niederce8b54d2010-04-10 00:39:41 -0500558 rm -f head-sha1 &&
559 echo "$rev1" >expect &&
560
Nanako Shiraishi47a528a2008-09-03 17:59:33 +0900561 git submodule update init &&
Jonathan Niederce8b54d2010-04-10 00:39:41 -0500562 inspect init &&
563
564 test_cmp expect head-sha1
Lars Hjemli88961ef2007-06-02 03:27:42 +0200565'
566
567test_expect_success 'status should be "up-to-date" after update' '
Jonathan Niederce8b54d2010-04-10 00:39:41 -0500568 git submodule status >list &&
569 grep "^ $rev1" list
Lars Hjemli88961ef2007-06-02 03:27:42 +0200570'
571
Sven Verdoolaege0cf73752007-07-17 20:28:28 +0200572test_expect_success 'checkout superproject with subproject already present' '
Nanako Shiraishi47a528a2008-09-03 17:59:33 +0900573 git checkout initial &&
Johannes Schindelin01dc8132020-11-18 23:44:39 +0000574 git checkout main
Sven Verdoolaege0cf73752007-07-17 20:28:28 +0200575'
576
Sven Verdoolaegee06c5a62007-08-15 19:22:09 +0200577test_expect_success 'apply submodule diff' '
578 git branch second &&
579 (
Junio C Hamanoa2d93ae2008-01-15 03:13:55 -0800580 cd init &&
Sven Verdoolaegee06c5a62007-08-15 19:22:09 +0200581 echo s >s &&
582 git add s &&
583 git commit -m "change subproject"
584 ) &&
Junio C Hamanoa2d93ae2008-01-15 03:13:55 -0800585 git update-index --add init &&
Nanako Shiraishi47a528a2008-09-03 17:59:33 +0900586 git commit -m "change init" &&
587 git format-patch -1 --stdout >P.diff &&
Sven Verdoolaegee06c5a62007-08-15 19:22:09 +0200588 git checkout second &&
589 git apply --index P.diff &&
Jonathan Niederce8b54d2010-04-10 00:39:41 -0500590
Johannes Schindelin01dc8132020-11-18 23:44:39 +0000591 git diff --cached main >staged &&
SZEDER Gábor1c5e94f2018-08-19 23:57:25 +0200592 test_must_be_empty staged
Sven Verdoolaegee06c5a62007-08-15 19:22:09 +0200593'
594
Johannes Schindelinbe4d2c82008-05-16 11:23:03 +0100595test_expect_success 'update --init' '
Johannes Schindelinbe4d2c82008-05-16 11:23:03 +0100596 mv init init2 &&
597 git config -f .gitmodules submodule.example.url "$(pwd)/init2" &&
Jonathan Niederce8b54d2010-04-10 00:39:41 -0500598 git config --remove-section submodule.example &&
599 test_must_fail git config submodule.example.url &&
600
Stefan Beller8c6b5492016-02-29 18:07:14 -0800601 git submodule update init 2> update.out &&
Ævar Arnfjörð Bjarmason1c2ef662011-05-21 18:44:08 +0000602 test_i18ngrep "not initialized" update.out &&
Fredrik Gustafssonabc06822011-08-15 23:17:46 +0200603 test_must_fail git rev-parse --resolve-git-dir init/.git &&
Jonathan Niederce8b54d2010-04-10 00:39:41 -0500604
Johannes Schindelinbe4d2c82008-05-16 11:23:03 +0100605 git submodule update --init init &&
Fredrik Gustafssonabc06822011-08-15 23:17:46 +0200606 git rev-parse --resolve-git-dir init/.git
Johannes Schindelinbe4d2c82008-05-16 11:23:03 +0100607'
608
John Keeping091a6eb2013-06-16 15:18:18 +0100609test_expect_success 'update --init from subdirectory' '
610 mv init init2 &&
611 git config -f .gitmodules submodule.example.url "$(pwd)/init2" &&
612 git config --remove-section submodule.example &&
613 test_must_fail git config submodule.example.url &&
614
615 mkdir -p sub &&
616 (
617 cd sub &&
Stefan Beller8c6b5492016-02-29 18:07:14 -0800618 git submodule update ../init 2>update.out &&
John Keeping091a6eb2013-06-16 15:18:18 +0100619 test_i18ngrep "not initialized" update.out &&
620 test_must_fail git rev-parse --resolve-git-dir ../init/.git &&
621
622 git submodule update --init ../init
623 ) &&
624 git rev-parse --resolve-git-dir init/.git
625'
626
Johannes Schindelin2ce53f92009-01-02 19:08:40 +0100627test_expect_success 'do not add files from a submodule' '
628
629 git reset --hard &&
630 test_must_fail git add init/a
631
632'
633
John Keeping2c63d6e2013-09-12 20:25:01 +0100634test_expect_success 'gracefully add/reset submodule with a trailing slash' '
Johannes Schindelin2ce53f92009-01-02 19:08:40 +0100635
636 git reset --hard &&
637 git commit -m "commit subproject" init &&
638 (cd init &&
639 echo b > a) &&
640 git add init/ &&
641 git diff --exit-code --cached init &&
642 commit=$(cd init &&
643 git commit -m update a >/dev/null &&
644 git rev-parse HEAD) &&
645 git add init/ &&
646 test_must_fail git diff --exit-code --cached init &&
647 test $commit = $(git ls-files --stage |
John Keeping2c63d6e2013-09-12 20:25:01 +0100648 sed -n "s/^160000 \([^ ]*\).*/\1/p") &&
649 git reset init/ &&
650 git diff --exit-code --cached init
Johannes Schindelin2ce53f92009-01-02 19:08:40 +0100651
652'
653
Johannes Schindelinf3670a52009-02-07 14:43:03 +0100654test_expect_success 'ls-files gracefully handles trailing slash' '
655
656 test "init" = "$(git ls-files init/)"
657
658'
659
Peter Collingbournec5e558a2010-01-11 02:59:54 +0000660test_expect_success 'moving to a commit without submodule does not leave empty dir' '
661 rm -rf init &&
662 mkdir init &&
663 git reset --hard &&
664 git checkout initial &&
665 test ! -d init &&
666 git checkout second
667'
668
Ramkumar Ramachandraaf9c9f92012-09-22 16:57:59 +0530669test_expect_success 'submodule <invalid-subcommand> fails' '
670 test_must_fail git submodule no-such-subcommand
Johannes Schindelin496917b2009-02-07 14:43:15 +0100671'
672
Jens Lehmann1414e572009-09-22 17:10:12 +0200673test_expect_success 'add submodules without specifying an explicit path' '
674 mkdir repo &&
Jonathan Nieder18a82692010-09-06 20:42:54 -0500675 (
676 cd repo &&
677 git init &&
678 echo r >r &&
679 git add r &&
680 git commit -m "repo commit 1"
Jens Lehmannfd4ec4f2010-09-06 20:39:54 +0200681 ) &&
Jens Lehmann1414e572009-09-22 17:10:12 +0200682 git clone --bare repo/ bare.git &&
Jens Lehmann69e72362010-12-05 00:27:35 +0100683 (
684 cd addtest &&
685 git submodule add "$submodurl/repo" &&
686 git config -f .gitmodules submodule.repo.path repo &&
687 git submodule add "$submodurl/bare.git" &&
688 git config -f .gitmodules submodule.bare.path bare
689 )
690'
691
692test_expect_success 'add should fail when path is used by a file' '
693 (
694 cd addtest &&
695 touch file &&
696 test_must_fail git submodule add "$submodurl/repo" file
697 )
698'
699
700test_expect_success 'add should fail when path is used by an existing directory' '
701 (
702 cd addtest &&
703 mkdir empty-dir &&
704 test_must_fail git submodule add "$submodurl/repo" empty-dir
705 )
Jens Lehmann1414e572009-09-22 17:10:12 +0200706'
707
Jens Lehmann4d689322011-06-06 21:58:04 +0200708test_expect_success 'use superproject as upstream when path is relative and no url is set there' '
Jens Lehmann8537f0e2011-06-06 21:57:01 +0200709 (
710 cd addtest &&
Jens Lehmann4d689322011-06-06 21:58:04 +0200711 git submodule add ../repo relative &&
712 test "$(git config -f .gitmodules submodule.relative.url)" = ../repo &&
713 git submodule sync relative &&
714 test "$(git config submodule.relative.url)" = "$submodurl/repo"
Jens Lehmann8537f0e2011-06-06 21:57:01 +0200715 )
716'
717
Thomas Rastea640cc2011-01-10 11:37:26 +0100718test_expect_success 'set up for relative path tests' '
719 mkdir reltest &&
720 (
721 cd reltest &&
722 git init &&
723 mkdir sub &&
724 (
725 cd sub &&
726 git init &&
727 test_commit foo
728 ) &&
729 git add sub &&
730 git config -f .gitmodules submodule.sub.path sub &&
731 git config -f .gitmodules submodule.sub.url ../subrepo &&
Jon Seymour712693e2012-06-03 19:46:47 +1000732 cp .git/config pristine-.git-config &&
733 cp .gitmodules pristine-.gitmodules
Thomas Rastea640cc2011-01-10 11:37:26 +0100734 )
735'
736
Jon Seymour712693e2012-06-03 19:46:47 +1000737test_expect_success '../subrepo works with URL - ssh://hostname/repo' '
Thomas Rastea640cc2011-01-10 11:37:26 +0100738 (
739 cd reltest &&
740 cp pristine-.git-config .git/config &&
Jon Seymour712693e2012-06-03 19:46:47 +1000741 cp pristine-.gitmodules .gitmodules &&
Thomas Rastea640cc2011-01-10 11:37:26 +0100742 git config remote.origin.url ssh://hostname/repo &&
743 git submodule init &&
744 test "$(git config submodule.sub.url)" = ssh://hostname/subrepo
745 )
746'
747
Jon Seymour712693e2012-06-03 19:46:47 +1000748test_expect_success '../subrepo works with port-qualified URL - ssh://hostname:22/repo' '
749 (
750 cd reltest &&
751 cp pristine-.git-config .git/config &&
752 cp pristine-.gitmodules .gitmodules &&
753 git config remote.origin.url ssh://hostname:22/repo &&
754 git submodule init &&
755 test "$(git config submodule.sub.url)" = ssh://hostname:22/subrepo
756 )
757'
758
Johannes Sixtc517e732012-06-14 14:10:27 +0200759# About the choice of the path in the next test:
760# - double-slash side-steps path mangling issues on Windows
761# - it is still an absolute local path
762# - there cannot be a server with a blank in its name just in case the
763# path is used erroneously to access a //server/share style path
764test_expect_success '../subrepo path works with local path - //somewhere else/repo' '
Jon Seymour712693e2012-06-03 19:46:47 +1000765 (
766 cd reltest &&
767 cp pristine-.git-config .git/config &&
768 cp pristine-.gitmodules .gitmodules &&
Johannes Sixtc517e732012-06-14 14:10:27 +0200769 git config remote.origin.url "//somewhere else/repo" &&
Jon Seymour712693e2012-06-03 19:46:47 +1000770 git submodule init &&
Johannes Sixtc517e732012-06-14 14:10:27 +0200771 test "$(git config submodule.sub.url)" = "//somewhere else/subrepo"
Jon Seymour712693e2012-06-03 19:46:47 +1000772 )
773'
774
775test_expect_success '../subrepo works with file URL - file:///tmp/repo' '
776 (
777 cd reltest &&
778 cp pristine-.git-config .git/config &&
779 cp pristine-.gitmodules .gitmodules &&
780 git config remote.origin.url file:///tmp/repo &&
781 git submodule init &&
782 test "$(git config submodule.sub.url)" = file:///tmp/subrepo
783 )
784'
785
786test_expect_success '../subrepo works with helper URL- helper:://hostname/repo' '
787 (
788 cd reltest &&
789 cp pristine-.git-config .git/config &&
790 cp pristine-.gitmodules .gitmodules &&
791 git config remote.origin.url helper:://hostname/repo &&
792 git submodule init &&
793 test "$(git config submodule.sub.url)" = helper:://hostname/subrepo
794 )
795'
796
797test_expect_success '../subrepo works with scp-style URL - user@host:repo' '
Thomas Rastea640cc2011-01-10 11:37:26 +0100798 (
799 cd reltest &&
800 cp pristine-.git-config .git/config &&
801 git config remote.origin.url user@host:repo &&
802 git submodule init &&
803 test "$(git config submodule.sub.url)" = user@host:subrepo
804 )
805'
806
Jon Seymour712693e2012-06-03 19:46:47 +1000807test_expect_success '../subrepo works with scp-style URL - user@host:path/to/repo' '
808 (
809 cd reltest &&
810 cp pristine-.git-config .git/config &&
811 cp pristine-.gitmodules .gitmodules &&
812 git config remote.origin.url user@host:path/to/repo &&
813 git submodule init &&
814 test "$(git config submodule.sub.url)" = user@host:path/to/subrepo
815 )
816'
817
Jon Seymour758615e2012-06-06 21:57:30 +1000818test_expect_success '../subrepo works with relative local path - foo' '
Jon Seymour49301c62012-06-03 19:46:48 +1000819 (
820 cd reltest &&
821 cp pristine-.git-config .git/config &&
822 cp pristine-.gitmodules .gitmodules &&
823 git config remote.origin.url foo &&
824 # actual: fails with an error
825 git submodule init &&
826 test "$(git config submodule.sub.url)" = subrepo
827 )
828'
829
Jon Seymour712693e2012-06-03 19:46:47 +1000830test_expect_success '../subrepo works with relative local path - foo/bar' '
831 (
832 cd reltest &&
833 cp pristine-.git-config .git/config &&
834 cp pristine-.gitmodules .gitmodules &&
835 git config remote.origin.url foo/bar &&
836 git submodule init &&
837 test "$(git config submodule.sub.url)" = foo/subrepo
838 )
839'
840
Jon Seymour758615e2012-06-06 21:57:30 +1000841test_expect_success '../subrepo works with relative local path - ./foo' '
Jon Seymour49301c62012-06-03 19:46:48 +1000842 (
843 cd reltest &&
844 cp pristine-.git-config .git/config &&
845 cp pristine-.gitmodules .gitmodules &&
846 git config remote.origin.url ./foo &&
847 git submodule init &&
848 test "$(git config submodule.sub.url)" = subrepo
849 )
850'
851
Jon Seymour758615e2012-06-06 21:57:30 +1000852test_expect_success '../subrepo works with relative local path - ./foo/bar' '
Jon Seymour49301c62012-06-03 19:46:48 +1000853 (
854 cd reltest &&
855 cp pristine-.git-config .git/config &&
856 cp pristine-.gitmodules .gitmodules &&
857 git config remote.origin.url ./foo/bar &&
858 git submodule init &&
859 test "$(git config submodule.sub.url)" = foo/subrepo
860 )
861'
862
Jon Seymour712693e2012-06-03 19:46:47 +1000863test_expect_success '../subrepo works with relative local path - ../foo' '
864 (
865 cd reltest &&
866 cp pristine-.git-config .git/config &&
867 cp pristine-.gitmodules .gitmodules &&
868 git config remote.origin.url ../foo &&
869 git submodule init &&
870 test "$(git config submodule.sub.url)" = ../subrepo
871 )
872'
873
874test_expect_success '../subrepo works with relative local path - ../foo/bar' '
875 (
876 cd reltest &&
877 cp pristine-.git-config .git/config &&
878 cp pristine-.gitmodules .gitmodules &&
879 git config remote.origin.url ../foo/bar &&
880 git submodule init &&
881 test "$(git config submodule.sub.url)" = ../foo/subrepo
882 )
883'
884
885test_expect_success '../bar/a/b/c works with relative local path - ../foo/bar.git' '
886 (
887 cd reltest &&
888 cp pristine-.git-config .git/config &&
889 cp pristine-.gitmodules .gitmodules &&
890 mkdir -p a/b/c &&
Kyle Meyere1381112019-04-09 19:07:35 -0400891 (cd a/b/c && git init && test_commit msg) &&
Jon Seymour712693e2012-06-03 19:46:47 +1000892 git config remote.origin.url ../foo/bar.git &&
893 git submodule add ../bar/a/b/c ./a/b/c &&
894 git submodule init &&
895 test "$(git config submodule.a/b/c.url)" = ../foo/bar/a/b/c
896 )
897'
898
Jens Lehmannd75219b2012-03-04 22:15:08 +0100899test_expect_success 'moving the superproject does not break submodules' '
900 (
901 cd addtest &&
902 git submodule status >expect
Jeff King99094a72015-03-20 06:07:15 -0400903 ) &&
Jens Lehmannd75219b2012-03-04 22:15:08 +0100904 mv addtest addtest2 &&
905 (
906 cd addtest2 &&
907 git submodule status >actual &&
908 test_cmp expect actual
909 )
910'
911
René Scharfe74b6bda2018-03-28 23:14:08 +0200912test_expect_success 'moving the submodule does not break the superproject' '
913 (
914 cd addtest2 &&
915 git submodule status
916 ) >actual &&
917 sed -e "s/^ \([^ ]* repo\) .*/-\1/" <actual >expect &&
918 mv addtest2/repo addtest2/repo.bak &&
919 test_when_finished "mv addtest2/repo.bak addtest2/repo" &&
920 (
921 cd addtest2 &&
922 git submodule status
923 ) >actual &&
924 test_cmp expect actual
925'
926
Jens Lehmann73b08982012-09-30 01:05:58 +0200927test_expect_success 'submodule add --name allows to replace a submodule with another at the same path' '
928 (
929 cd addtest2 &&
930 (
931 cd repo &&
932 echo "$submodurl/repo" >expect &&
933 git config remote.origin.url >actual &&
934 test_cmp expect actual &&
935 echo "gitdir: ../.git/modules/repo" >expect &&
936 test_cmp expect .git
937 ) &&
938 rm -rf repo &&
939 git rm repo &&
940 git submodule add -q --name repo_new "$submodurl/bare.git" repo >actual &&
Junio C Hamanoca8d1482013-06-09 11:29:20 -0700941 test_must_be_empty actual &&
Jens Lehmann73b08982012-09-30 01:05:58 +0200942 echo "gitdir: ../.git/modules/submod" >expect &&
943 test_cmp expect submod/.git &&
944 (
945 cd repo &&
946 echo "$submodurl/bare.git" >expect &&
947 git config remote.origin.url >actual &&
948 test_cmp expect actual &&
949 echo "gitdir: ../.git/modules/repo_new" >expect &&
950 test_cmp expect .git
951 ) &&
952 echo "repo" >expect &&
Jens Lehmann95c16412013-08-06 21:15:25 +0200953 test_must_fail git config -f .gitmodules submodule.repo.path &&
Jens Lehmann73b08982012-09-30 01:05:58 +0200954 git config -f .gitmodules submodule.repo_new.path >actual &&
Andrei Rybak64d10222020-03-22 22:14:22 +0100955 test_cmp expect actual &&
Jens Lehmann73b08982012-09-30 01:05:58 +0200956 echo "$submodurl/repo" >expect &&
Jens Lehmann95c16412013-08-06 21:15:25 +0200957 test_must_fail git config -f .gitmodules submodule.repo.url &&
Jens Lehmann73b08982012-09-30 01:05:58 +0200958 echo "$submodurl/bare.git" >expect &&
959 git config -f .gitmodules submodule.repo_new.url >actual &&
960 test_cmp expect actual &&
961 echo "$submodurl/repo" >expect &&
962 git config submodule.repo.url >actual &&
963 test_cmp expect actual &&
964 echo "$submodurl/bare.git" >expect &&
965 git config submodule.repo_new.url >actual &&
966 test_cmp expect actual
967 )
968'
969
Stefan Bellerf8eaa0b2016-03-31 17:17:28 -0700970test_expect_success 'recursive relative submodules stay relative' '
Stefan Beller3fea1212016-03-31 14:04:36 -0700971 test_when_finished "rm -rf super clone2 subsub sub3" &&
972 mkdir subsub &&
973 (
974 cd subsub &&
975 git init &&
976 >t &&
977 git add t &&
978 git commit -m "initial commit"
979 ) &&
980 mkdir sub3 &&
981 (
982 cd sub3 &&
983 git init &&
984 >t &&
985 git add t &&
986 git commit -m "initial commit" &&
987 git submodule add ../subsub dirdir/subsub &&
988 git commit -m "add submodule subsub"
989 ) &&
990 mkdir super &&
991 (
992 cd super &&
993 git init &&
994 >t &&
995 git add t &&
996 git commit -m "initial commit" &&
997 git submodule add ../sub3 &&
998 git commit -m "add submodule sub"
999 ) &&
1000 git clone super clone2 &&
1001 (
1002 cd clone2 &&
1003 git submodule update --init --recursive &&
1004 echo "gitdir: ../.git/modules/sub3" >./sub3/.git_expect &&
1005 echo "gitdir: ../../../.git/modules/sub3/modules/dirdir/subsub" >./sub3/dirdir/subsub/.git_expect
1006 ) &&
1007 test_cmp clone2/sub3/.git_expect clone2/sub3/.git &&
1008 test_cmp clone2/sub3/dirdir/subsub/.git_expect clone2/sub3/dirdir/subsub/.git
1009'
1010
Jens Lehmann4b7c2862012-09-30 23:01:29 +02001011test_expect_success 'submodule add with an existing name fails unless forced' '
1012 (
1013 cd addtest2 &&
1014 rm -rf repo &&
1015 git rm repo &&
1016 test_must_fail git submodule add -q --name repo_new "$submodurl/repo.git" repo &&
1017 test ! -d repo &&
Jens Lehmann95c16412013-08-06 21:15:25 +02001018 test_must_fail git config -f .gitmodules submodule.repo_new.path &&
1019 test_must_fail git config -f .gitmodules submodule.repo_new.url &&
Jens Lehmann4b7c2862012-09-30 23:01:29 +02001020 echo "$submodurl/bare.git" >expect &&
1021 git config submodule.repo_new.url >actual &&
1022 test_cmp expect actual &&
1023 git submodule add -f -q --name repo_new "$submodurl/repo.git" repo &&
1024 test -d repo &&
1025 echo "repo" >expect &&
1026 git config -f .gitmodules submodule.repo_new.path >actual &&
Andrei Rybak64d10222020-03-22 22:14:22 +01001027 test_cmp expect actual &&
Jens Lehmann4b7c2862012-09-30 23:01:29 +02001028 echo "$submodurl/repo.git" >expect &&
1029 git config -f .gitmodules submodule.repo_new.url >actual &&
1030 test_cmp expect actual &&
1031 echo "$submodurl/repo.git" >expect &&
1032 git config submodule.repo_new.url >actual &&
1033 test_cmp expect actual
1034 )
1035'
1036
Jens Lehmanncf419822013-03-04 22:20:24 +01001037test_expect_success 'set up a second submodule' '
1038 git submodule add ./init2 example2 &&
1039 git commit -m "submodule example2 added"
1040'
1041
Stefan Beller84ba9592016-03-22 16:42:14 -07001042test_expect_success 'submodule deinit works on repository without submodules' '
1043 test_when_finished "rm -rf newdirectory" &&
1044 mkdir newdirectory &&
1045 (
1046 cd newdirectory &&
1047 git init &&
1048 >file &&
1049 git add file &&
Stefan Beller14544dd2016-05-02 15:24:02 -07001050 git commit -m "repo should not be empty" &&
Stefan Bellerf6a52792016-05-05 12:52:32 -07001051 git submodule deinit . &&
1052 git submodule deinit --all
Stefan Beller84ba9592016-03-22 16:42:14 -07001053 )
1054'
1055
Jens Lehmanncf419822013-03-04 22:20:24 +01001056test_expect_success 'submodule deinit should remove the whole submodule section from .git/config' '
1057 git config submodule.example.foo bar &&
1058 git config submodule.example2.frotz nitfol &&
1059 git submodule deinit init &&
1060 test -z "$(git config --get-regexp "submodule\.example\.")" &&
1061 test -n "$(git config --get-regexp "submodule\.example2\.")" &&
1062 test -f example2/.git &&
1063 rmdir init
1064'
1065
Stefan Beller8eda5ef2018-12-14 15:59:45 -08001066test_expect_success 'submodule deinit should unset core.worktree' '
1067 test_path_is_file .git/modules/example/config &&
1068 test_must_fail git config -f .git/modules/example/config core.worktree
1069'
1070
John Keeping091a6eb2013-06-16 15:18:18 +01001071test_expect_success 'submodule deinit from subdirectory' '
1072 git submodule update --init &&
1073 git config submodule.example.foo bar &&
1074 mkdir -p sub &&
1075 (
1076 cd sub &&
1077 git submodule deinit ../init >../output
1078 ) &&
Vasco Almeida1edbaac2016-06-17 20:21:07 +00001079 test_i18ngrep "\\.\\./init" output &&
John Keeping091a6eb2013-06-16 15:18:18 +01001080 test -z "$(git config --get-regexp "submodule\.example\.")" &&
1081 test -n "$(git config --get-regexp "submodule\.example2\.")" &&
1082 test -f example2/.git &&
1083 rmdir init
1084'
1085
Jens Lehmanncf419822013-03-04 22:20:24 +01001086test_expect_success 'submodule deinit . deinits all initialized submodules' '
1087 git submodule update --init &&
1088 git config submodule.example.foo bar &&
1089 git config submodule.example2.frotz nitfol &&
1090 test_must_fail git submodule deinit &&
Jens Lehmann7b294bf2013-04-01 21:02:00 +02001091 git submodule deinit . >actual &&
Jens Lehmanncf419822013-03-04 22:20:24 +01001092 test -z "$(git config --get-regexp "submodule\.example\.")" &&
1093 test -z "$(git config --get-regexp "submodule\.example2\.")" &&
Jens Lehmann7b294bf2013-04-01 21:02:00 +02001094 test_i18ngrep "Cleared directory .init" actual &&
1095 test_i18ngrep "Cleared directory .example2" actual &&
Jens Lehmanncf419822013-03-04 22:20:24 +01001096 rmdir init example2
1097'
1098
Stefan Bellerf6a52792016-05-05 12:52:32 -07001099test_expect_success 'submodule deinit --all deinits all initialized submodules' '
1100 git submodule update --init &&
1101 git config submodule.example.foo bar &&
1102 git config submodule.example2.frotz nitfol &&
1103 test_must_fail git submodule deinit &&
1104 git submodule deinit --all >actual &&
1105 test -z "$(git config --get-regexp "submodule\.example\.")" &&
1106 test -z "$(git config --get-regexp "submodule\.example2\.")" &&
1107 test_i18ngrep "Cleared directory .init" actual &&
1108 test_i18ngrep "Cleared directory .example2" actual &&
1109 rmdir init example2
1110'
1111
Jens Lehmanncf419822013-03-04 22:20:24 +01001112test_expect_success 'submodule deinit deinits a submodule when its work tree is missing or empty' '
1113 git submodule update --init &&
1114 rm -rf init example2/* example2/.git &&
Jens Lehmann7b294bf2013-04-01 21:02:00 +02001115 git submodule deinit init example2 >actual &&
Jens Lehmanncf419822013-03-04 22:20:24 +01001116 test -z "$(git config --get-regexp "submodule\.example\.")" &&
1117 test -z "$(git config --get-regexp "submodule\.example2\.")" &&
Jens Lehmann7b294bf2013-04-01 21:02:00 +02001118 test_i18ngrep ! "Cleared directory .init" actual &&
1119 test_i18ngrep "Cleared directory .example2" actual &&
Jens Lehmanncf419822013-03-04 22:20:24 +01001120 rmdir init
1121'
1122
1123test_expect_success 'submodule deinit fails when the submodule contains modifications unless forced' '
1124 git submodule update --init &&
1125 echo X >>init/s &&
1126 test_must_fail git submodule deinit init &&
1127 test -n "$(git config --get-regexp "submodule\.example\.")" &&
1128 test -f example2/.git &&
Jens Lehmann7b294bf2013-04-01 21:02:00 +02001129 git submodule deinit -f init >actual &&
Jens Lehmanncf419822013-03-04 22:20:24 +01001130 test -z "$(git config --get-regexp "submodule\.example\.")" &&
Jens Lehmann7b294bf2013-04-01 21:02:00 +02001131 test_i18ngrep "Cleared directory .init" actual &&
Jens Lehmanncf419822013-03-04 22:20:24 +01001132 rmdir init
1133'
1134
1135test_expect_success 'submodule deinit fails when the submodule contains untracked files unless forced' '
1136 git submodule update --init &&
1137 echo X >>init/untracked &&
1138 test_must_fail git submodule deinit init &&
1139 test -n "$(git config --get-regexp "submodule\.example\.")" &&
1140 test -f example2/.git &&
Jens Lehmann7b294bf2013-04-01 21:02:00 +02001141 git submodule deinit -f init >actual &&
Jens Lehmanncf419822013-03-04 22:20:24 +01001142 test -z "$(git config --get-regexp "submodule\.example\.")" &&
Jens Lehmann7b294bf2013-04-01 21:02:00 +02001143 test_i18ngrep "Cleared directory .init" actual &&
Jens Lehmanncf419822013-03-04 22:20:24 +01001144 rmdir init
1145'
1146
1147test_expect_success 'submodule deinit fails when the submodule HEAD does not match unless forced' '
1148 git submodule update --init &&
1149 (
1150 cd init &&
1151 git checkout HEAD^
1152 ) &&
1153 test_must_fail git submodule deinit init &&
1154 test -n "$(git config --get-regexp "submodule\.example\.")" &&
1155 test -f example2/.git &&
Jens Lehmann7b294bf2013-04-01 21:02:00 +02001156 git submodule deinit -f init >actual &&
Jens Lehmanncf419822013-03-04 22:20:24 +01001157 test -z "$(git config --get-regexp "submodule\.example\.")" &&
Jens Lehmann7b294bf2013-04-01 21:02:00 +02001158 test_i18ngrep "Cleared directory .init" actual &&
Jens Lehmanncf419822013-03-04 22:20:24 +01001159 rmdir init
1160'
1161
1162test_expect_success 'submodule deinit is silent when used on an uninitialized submodule' '
1163 git submodule update --init &&
1164 git submodule deinit init >actual &&
1165 test_i18ngrep "Submodule .example. (.*) unregistered for path .init" actual &&
Jens Lehmann7b294bf2013-04-01 21:02:00 +02001166 test_i18ngrep "Cleared directory .init" actual &&
Jens Lehmanncf419822013-03-04 22:20:24 +01001167 git submodule deinit init >actual &&
1168 test_i18ngrep ! "Submodule .example. (.*) unregistered for path .init" actual &&
Jens Lehmann7b294bf2013-04-01 21:02:00 +02001169 test_i18ngrep "Cleared directory .init" actual &&
Jens Lehmanncf419822013-03-04 22:20:24 +01001170 git submodule deinit . >actual &&
1171 test_i18ngrep ! "Submodule .example. (.*) unregistered for path .init" actual &&
1172 test_i18ngrep "Submodule .example2. (.*) unregistered for path .example2" actual &&
Jens Lehmann7b294bf2013-04-01 21:02:00 +02001173 test_i18ngrep "Cleared directory .init" actual &&
Jens Lehmanncf419822013-03-04 22:20:24 +01001174 git submodule deinit . >actual &&
1175 test_i18ngrep ! "Submodule .example. (.*) unregistered for path .init" actual &&
1176 test_i18ngrep ! "Submodule .example2. (.*) unregistered for path .example2" actual &&
Jens Lehmann7b294bf2013-04-01 21:02:00 +02001177 test_i18ngrep "Cleared directory .init" actual &&
Stefan Bellerf6a52792016-05-05 12:52:32 -07001178 git submodule deinit --all >actual &&
1179 test_i18ngrep ! "Submodule .example. (.*) unregistered for path .init" actual &&
1180 test_i18ngrep ! "Submodule .example2. (.*) unregistered for path .example2" actual &&
1181 test_i18ngrep "Cleared directory .init" actual &&
Jens Lehmanncf419822013-03-04 22:20:24 +01001182 rmdir init example2
1183'
1184
1185test_expect_success 'submodule deinit fails when submodule has a .git directory even when forced' '
1186 git submodule update --init &&
1187 (
1188 cd init &&
1189 rm .git &&
1190 cp -R ../.git/modules/example .git &&
1191 GIT_WORK_TREE=. git config --unset core.worktree
1192 ) &&
1193 test_must_fail git submodule deinit init &&
1194 test_must_fail git submodule deinit -f init &&
1195 test -d init/.git &&
1196 test -n "$(git config --get-regexp "submodule\.example\.")"
1197'
1198
Torsten Bögershausenbed94702013-06-20 16:58:48 +02001199test_expect_success 'submodule with UTF-8 name' '
1200 svname=$(printf "\303\245 \303\244\303\266") &&
1201 mkdir "$svname" &&
Fredrik Gustafsson74671242013-06-14 02:26:02 +02001202 (
Torsten Bögershausenbed94702013-06-20 16:58:48 +02001203 cd "$svname" &&
Fredrik Gustafsson74671242013-06-14 02:26:02 +02001204 git init &&
Torsten Bögershausenbed94702013-06-20 16:58:48 +02001205 >sub &&
1206 git add sub &&
Fredrik Gustafsson74671242013-06-14 02:26:02 +02001207 git commit -m "init sub"
Torsten Bögershausenbed94702013-06-20 16:58:48 +02001208 ) &&
Torsten Bögershausenbed94702013-06-20 16:58:48 +02001209 git submodule add ./"$svname" &&
1210 git submodule >&2 &&
1211 test -n "$(git submodule | grep "$svname")"
Fredrik Gustafsson74671242013-06-14 02:26:02 +02001212'
Junio C Hamano2bb7afa2013-07-15 10:28:48 -07001213
Fredrik Gustafsson275cd182013-07-02 23:42:56 +02001214test_expect_success 'submodule add clone shallow submodule' '
1215 mkdir super &&
Jeff King99094a72015-03-20 06:07:15 -04001216 pwd=$(pwd) &&
Fredrik Gustafsson275cd182013-07-02 23:42:56 +02001217 (
1218 cd super &&
1219 git init &&
1220 git submodule add --depth=1 file://"$pwd"/example2 submodule &&
1221 (
1222 cd submodule &&
1223 test 1 = $(git log --oneline | wc -l)
1224 )
1225 )
1226'
1227
Stefan Beller2b56bb72016-02-24 13:15:02 -08001228test_expect_success 'submodule helper list is not confused by common prefixes' '
1229 mkdir -p dir1/b &&
1230 (
1231 cd dir1/b &&
1232 git init &&
1233 echo hi >testfile2 &&
1234 git add . &&
1235 git commit -m "test1"
1236 ) &&
1237 mkdir -p dir2/b &&
1238 (
1239 cd dir2/b &&
1240 git init &&
1241 echo hello >testfile1 &&
1242 git add . &&
1243 git commit -m "test2"
1244 ) &&
1245 git submodule add /dir1/b dir1/b &&
1246 git submodule add /dir2/b dir2/b &&
1247 git commit -m "first submodule commit" &&
brian m. carlsonc0b65ea2020-07-29 23:14:03 +00001248 git submodule--helper list dir1/b | cut -f 2 >actual &&
Stefan Beller2b56bb72016-02-24 13:15:02 -08001249 echo "dir1/b" >expect &&
1250 test_cmp expect actual
1251'
1252
Brandon Williams3e7eaed2017-03-17 15:38:02 -07001253test_expect_success 'setup superproject with submodules' '
1254 git init sub1 &&
1255 test_commit -C sub1 test &&
1256 test_commit -C sub1 test2 &&
1257 git init multisuper &&
1258 git -C multisuper submodule add ../sub1 sub0 &&
1259 git -C multisuper submodule add ../sub1 sub1 &&
1260 git -C multisuper submodule add ../sub1 sub2 &&
1261 git -C multisuper submodule add ../sub1 sub3 &&
1262 git -C multisuper commit -m "add some submodules"
1263'
1264
1265cat >expect <<-EOF
1266-sub0
1267 sub1 (test2)
1268 sub2 (test2)
1269 sub3 (test2)
1270EOF
1271
1272test_expect_success 'submodule update --init with a specification' '
1273 test_when_finished "rm -rf multisuper_clone" &&
1274 pwd=$(pwd) &&
1275 git clone file://"$pwd"/multisuper multisuper_clone &&
1276 git -C multisuper_clone submodule update --init . ":(exclude)sub0" &&
brian m. carlsonc0b65ea2020-07-29 23:14:03 +00001277 git -C multisuper_clone submodule status | sed "s/$OID_REGEX //" >actual &&
Brandon Williams3e7eaed2017-03-17 15:38:02 -07001278 test_cmp expect actual
1279'
1280
1281test_expect_success 'submodule update --init with submodule.active set' '
1282 test_when_finished "rm -rf multisuper_clone" &&
1283 pwd=$(pwd) &&
1284 git clone file://"$pwd"/multisuper multisuper_clone &&
1285 git -C multisuper_clone config submodule.active "." &&
1286 git -C multisuper_clone config --add submodule.active ":(exclude)sub0" &&
1287 git -C multisuper_clone submodule update --init &&
brian m. carlsonc0b65ea2020-07-29 23:14:03 +00001288 git -C multisuper_clone submodule status | sed "s/$OID_REGEX //" >actual &&
Brandon Williams3e7eaed2017-03-17 15:38:02 -07001289 test_cmp expect actual
1290'
1291
1292test_expect_success 'submodule update and setting submodule.<name>.active' '
1293 test_when_finished "rm -rf multisuper_clone" &&
1294 pwd=$(pwd) &&
1295 git clone file://"$pwd"/multisuper multisuper_clone &&
1296 git -C multisuper_clone config --bool submodule.sub0.active "true" &&
1297 git -C multisuper_clone config --bool submodule.sub1.active "false" &&
1298 git -C multisuper_clone config --bool submodule.sub2.active "true" &&
1299
1300 cat >expect <<-\EOF &&
1301 sub0 (test2)
1302 -sub1
1303 sub2 (test2)
1304 -sub3
1305 EOF
1306 git -C multisuper_clone submodule update &&
brian m. carlsonc0b65ea2020-07-29 23:14:03 +00001307 git -C multisuper_clone submodule status | sed "s/$OID_REGEX //" >actual &&
Brandon Williams3e7eaed2017-03-17 15:38:02 -07001308 test_cmp expect actual
1309'
Fredrik Gustafsson275cd182013-07-02 23:42:56 +02001310
Stefan Bellere0a862f2018-10-16 10:27:03 -07001311test_expect_success 'clone active submodule without submodule url set' '
1312 test_when_finished "rm -rf test/test" &&
1313 mkdir test &&
1314 # another dir breaks accidental relative paths still being correct
1315 git clone file://"$pwd"/multisuper test/test &&
1316 (
1317 cd test/test &&
1318 git config submodule.active "." &&
1319
1320 # do not pass --init flag, as the submodule is already active:
1321 git submodule update &&
1322 git submodule status >actual_raw &&
1323
brian m. carlsonc0b65ea2020-07-29 23:14:03 +00001324 cut -d" " -f3- actual_raw >actual &&
Stefan Bellere0a862f2018-10-16 10:27:03 -07001325 cat >expect <<-\EOF &&
brian m. carlsonc0b65ea2020-07-29 23:14:03 +00001326 sub0 (test2)
1327 sub1 (test2)
1328 sub2 (test2)
1329 sub3 (test2)
Stefan Bellere0a862f2018-10-16 10:27:03 -07001330 EOF
1331 test_cmp expect actual
1332 )
1333'
1334
Brandon Williamsbb62e0a2017-03-17 15:38:03 -07001335test_expect_success 'clone --recurse-submodules with a pathspec works' '
1336 test_when_finished "rm -rf multisuper_clone" &&
1337 cat >expected <<-\EOF &&
1338 sub0 (test2)
1339 -sub1
1340 -sub2
1341 -sub3
1342 EOF
1343
1344 git clone --recurse-submodules="sub0" multisuper multisuper_clone &&
brian m. carlsonc0b65ea2020-07-29 23:14:03 +00001345 git -C multisuper_clone submodule status | sed "s/$OID_REGEX //" >actual &&
Stefan Beller9c5b2fa2017-10-06 12:00:06 -07001346 test_cmp expected actual
Brandon Williamsbb62e0a2017-03-17 15:38:03 -07001347'
1348
1349test_expect_success 'clone with multiple --recurse-submodules options' '
1350 test_when_finished "rm -rf multisuper_clone" &&
1351 cat >expect <<-\EOF &&
1352 -sub0
1353 sub1 (test2)
1354 -sub2
1355 sub3 (test2)
1356 EOF
1357
1358 git clone --recurse-submodules="." \
1359 --recurse-submodules=":(exclude)sub0" \
1360 --recurse-submodules=":(exclude)sub2" \
1361 multisuper multisuper_clone &&
brian m. carlsonc0b65ea2020-07-29 23:14:03 +00001362 git -C multisuper_clone submodule status | sed "s/$OID_REGEX //" >actual &&
Brandon Williamsbb62e0a2017-03-17 15:38:03 -07001363 test_cmp expect actual
1364'
1365
1366test_expect_success 'clone and subsequent updates correctly auto-initialize submodules' '
1367 test_when_finished "rm -rf multisuper_clone" &&
1368 cat <<-\EOF >expect &&
1369 -sub0
1370 sub1 (test2)
1371 -sub2
1372 sub3 (test2)
1373 EOF
1374
1375 cat <<-\EOF >expect2 &&
1376 -sub0
1377 sub1 (test2)
1378 -sub2
1379 sub3 (test2)
1380 -sub4
1381 sub5 (test2)
1382 EOF
1383
1384 git clone --recurse-submodules="." \
1385 --recurse-submodules=":(exclude)sub0" \
1386 --recurse-submodules=":(exclude)sub2" \
1387 --recurse-submodules=":(exclude)sub4" \
1388 multisuper multisuper_clone &&
1389
brian m. carlsonc0b65ea2020-07-29 23:14:03 +00001390 git -C multisuper_clone submodule status | sed "s/$OID_REGEX //" >actual &&
Brandon Williamsbb62e0a2017-03-17 15:38:03 -07001391 test_cmp expect actual &&
1392
1393 git -C multisuper submodule add ../sub1 sub4 &&
1394 git -C multisuper submodule add ../sub1 sub5 &&
1395 git -C multisuper commit -m "add more submodules" &&
1396 # obtain the new superproject
1397 git -C multisuper_clone pull &&
1398 git -C multisuper_clone submodule update --init &&
brian m. carlsonc0b65ea2020-07-29 23:14:03 +00001399 git -C multisuper_clone submodule status | sed "s/$OID_REGEX //" >actual &&
Brandon Williamsbb62e0a2017-03-17 15:38:03 -07001400 test_cmp expect2 actual
1401'
1402
Brandon Williams1f8d7112017-03-17 15:38:04 -07001403test_expect_success 'init properly sets the config' '
1404 test_when_finished "rm -rf multisuper_clone" &&
1405 git clone --recurse-submodules="." \
1406 --recurse-submodules=":(exclude)sub0" \
1407 multisuper multisuper_clone &&
1408
1409 git -C multisuper_clone submodule init -- sub0 sub1 &&
1410 git -C multisuper_clone config --get submodule.sub0.active &&
1411 test_must_fail git -C multisuper_clone config --get submodule.sub1.active
1412'
1413
Brandon Williams03c004c2017-08-03 15:25:44 -07001414test_expect_success 'recursive clone respects -q' '
1415 test_when_finished "rm -rf multisuper_clone" &&
1416 git clone -q --recurse-submodules multisuper multisuper_clone >actual &&
1417 test_must_be_empty actual
1418'
1419
Lars Hjemli88961ef2007-06-02 03:27:42 +02001420test_done