blob: 5811a982f472e3b79f31cc50dcdef92dcdb4a58c [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
12. ./test-lib.sh
13
Jonathan Niederfe454b12010-04-10 00:38:37 -050014test_expect_success 'setup - initial commit' '
15 >t &&
Nanako Shiraishi47a528a2008-09-03 17:59:33 +090016 git add t &&
17 git commit -m "initial commit" &&
Jonathan Niederfe454b12010-04-10 00:38:37 -050018 git branch initial
19'
20
Jharrod LaFon4b054402013-08-19 09:26:56 -070021test_expect_success 'configuration parsing' '
22 test_when_finished "rm -f .gitmodules" &&
23 cat >.gitmodules <<-\EOF &&
24 [submodule "s"]
25 path
26 ignore
27 EOF
28 test_must_fail git status
29'
30
Jonathan Niederfe454b12010-04-10 00:38:37 -050031test_expect_success 'setup - repository in init subdirectory' '
Junio C Hamanoa2d93ae2008-01-15 03:13:55 -080032 mkdir init &&
Jonathan Niederfe454b12010-04-10 00:38:37 -050033 (
34 cd init &&
35 git init &&
36 echo a >a &&
37 git add a &&
38 git commit -m "submodule commit 1" &&
39 git tag -a -m "rev-1" rev-1
40 )
Jonathan Niederfe454b12010-04-10 00:38:37 -050041'
42
43test_expect_success 'setup - commit with gitlink' '
Lars Hjemli88961ef2007-06-02 03:27:42 +020044 echo a >a &&
45 echo z >z &&
Junio C Hamanoa2d93ae2008-01-15 03:13:55 -080046 git add a init z &&
Jonathan Niederfe454b12010-04-10 00:38:37 -050047 git commit -m "super commit 1"
48'
49
50test_expect_success 'setup - hide init subdirectory' '
51 mv init .subrepo
52'
53
Jonathan Niedera76c9442010-04-10 00:39:04 -050054test_expect_success 'setup - repository to add submodules to' '
Ævar Arnfjörð Bjarmason31991b02010-07-05 17:33:03 +000055 git init addtest &&
56 git init addtest-ignore
Michael J Gruberac8463d2009-03-03 16:08:20 +010057'
58
Jonathan Niedera76c9442010-04-10 00:39:04 -050059# The 'submodule add' tests need some repository to add as a submodule.
Jeff Kingdd008b32011-07-30 09:05:54 -060060# The trash directory is a good one as any. We need to canonicalize
61# the name, though, as some tests compare it to the absolute path git
62# generates, which will expand symbolic links.
63submodurl=$(pwd -P)
Jonathan Niedera76c9442010-04-10 00:39:04 -050064
65listbranches() {
66 git for-each-ref --format='%(refname)' 'refs/heads/*'
67}
68
69inspect() {
70 dir=$1 &&
71 dotdot="${2:-..}" &&
72
73 (
74 cd "$dir" &&
75 listbranches >"$dotdot/heads" &&
76 { git symbolic-ref HEAD || :; } >"$dotdot/head" &&
Jonathan Niederce8b54d2010-04-10 00:39:41 -050077 git rev-parse HEAD >"$dotdot/head-sha1" &&
Jonathan Niedera76c9442010-04-10 00:39:04 -050078 git update-index --refresh &&
79 git diff-files --exit-code &&
80 git clean -n -d -x >"$dotdot/untracked"
81 )
82}
83
Michael J Gruberac8463d2009-03-03 16:08:20 +010084test_expect_success 'submodule add' '
Jonathan Niedera76c9442010-04-10 00:39:04 -050085 echo "refs/heads/master" >expect &&
86 >empty &&
87
Michael J Gruberac8463d2009-03-03 16:08:20 +010088 (
89 cd addtest &&
Jens Lehmann7e604072011-07-26 23:39:03 +020090 git submodule add -q "$submodurl" submod >actual &&
Junio C Hamanoca8d1482013-06-09 11:29:20 -070091 test_must_be_empty actual &&
Jens Lehmannea115a02012-03-04 22:14:30 +010092 echo "gitdir: ../.git/modules/submod" >expect &&
93 test_cmp expect submod/.git &&
Jens Lehmannd75219b2012-03-04 22:15:08 +010094 (
95 cd submod &&
96 git config core.worktree >actual &&
97 echo "../../../submod" >expect &&
98 test_cmp expect actual &&
99 rm -f actual expect
100 ) &&
Michael J Gruberac8463d2009-03-03 16:08:20 +0100101 git submodule init
Jonathan Niedera76c9442010-04-10 00:39:04 -0500102 ) &&
103
104 rm -f heads head untracked &&
105 inspect addtest/submod ../.. &&
106 test_cmp expect heads &&
107 test_cmp expect head &&
108 test_cmp empty untracked
Michael J Gruberac8463d2009-03-03 16:08:20 +0100109'
110
Jens Lehmannd27b8762010-07-17 17:11:43 +0200111test_expect_success 'submodule add to .gitignored path fails' '
Ævar Arnfjörð Bjarmason31991b02010-07-05 17:33:03 +0000112 (
113 cd addtest-ignore &&
Jens Lehmannd27b8762010-07-17 17:11:43 +0200114 cat <<-\EOF >expect &&
115 The following path is ignored by one of your .gitignore files:
116 submod
117 Use -f if you really want to add it.
118 EOF
Ævar Arnfjörð Bjarmason31991b02010-07-05 17:33:03 +0000119 # Does not use test_commit due to the ignore
120 echo "*" > .gitignore &&
121 git add --force .gitignore &&
122 git commit -m"Ignore everything" &&
Jens Lehmannd27b8762010-07-17 17:11:43 +0200123 ! git submodule add "$submodurl" submod >actual 2>&1 &&
Ævar Arnfjörð Bjarmason3a4c3ed2011-05-21 18:44:07 +0000124 test_i18ncmp expect actual
Jens Lehmannd27b8762010-07-17 17:11:43 +0200125 )
126'
Ævar Arnfjörð Bjarmason31991b02010-07-05 17:33:03 +0000127
Jens Lehmannd27b8762010-07-17 17:11:43 +0200128test_expect_success 'submodule add to .gitignored path with --force' '
129 (
130 cd addtest-ignore &&
131 git submodule add --force "$submodurl" submod
132 )
Ævar Arnfjörð Bjarmason31991b02010-07-05 17:33:03 +0000133'
134
Ben Jacksonea10b602009-04-18 20:42:07 -0700135test_expect_success 'submodule add --branch' '
Jonathan Niedera76c9442010-04-10 00:39:04 -0500136 echo "refs/heads/initial" >expect-head &&
137 cat <<-\EOF >expect-heads &&
138 refs/heads/initial
139 refs/heads/master
140 EOF
141 >empty &&
142
Ben Jacksonea10b602009-04-18 20:42:07 -0700143 (
144 cd addtest &&
145 git submodule add -b initial "$submodurl" submod-branch &&
W. Trevor Kingb9289222012-12-19 11:03:33 -0500146 test "initial" = "$(git config -f .gitmodules submodule.submod-branch.branch)" &&
Jonathan Niedera76c9442010-04-10 00:39:04 -0500147 git submodule init
148 ) &&
149
150 rm -f heads head untracked &&
151 inspect addtest/submod-branch ../.. &&
152 test_cmp expect-heads heads &&
153 test_cmp expect-head head &&
154 test_cmp empty untracked
Ben Jacksonea10b602009-04-18 20:42:07 -0700155'
156
Michael J Gruberdb75ada2009-03-03 16:08:21 +0100157test_expect_success 'submodule add with ./ in path' '
Jonathan Niedera76c9442010-04-10 00:39:04 -0500158 echo "refs/heads/master" >expect &&
159 >empty &&
160
Michael J Gruberac8463d2009-03-03 16:08:20 +0100161 (
162 cd addtest &&
163 git submodule add "$submodurl" ././dotsubmod/./frotz/./ &&
164 git submodule init
Jonathan Niedera76c9442010-04-10 00:39:04 -0500165 ) &&
166
167 rm -f heads head untracked &&
168 inspect addtest/dotsubmod/frotz ../../.. &&
169 test_cmp expect heads &&
170 test_cmp expect head &&
171 test_cmp empty untracked
Michael J Gruberac8463d2009-03-03 16:08:20 +0100172'
173
Patrick Steinhardt8196e722015-01-30 16:14:03 +0100174test_expect_success 'submodule add with /././ in path' '
175 echo "refs/heads/master" >expect &&
176 >empty &&
177
178 (
179 cd addtest &&
180 git submodule add "$submodurl" dotslashdotsubmod/././frotz/./ &&
181 git submodule init
182 ) &&
183
184 rm -f heads head untracked &&
185 inspect addtest/dotslashdotsubmod/frotz ../../.. &&
186 test_cmp expect heads &&
187 test_cmp expect head &&
188 test_cmp empty untracked
189'
190
Michael J Gruberdb75ada2009-03-03 16:08:21 +0100191test_expect_success 'submodule add with // in path' '
Jonathan Niedera76c9442010-04-10 00:39:04 -0500192 echo "refs/heads/master" >expect &&
193 >empty &&
194
Michael J Gruberac8463d2009-03-03 16:08:20 +0100195 (
196 cd addtest &&
197 git submodule add "$submodurl" slashslashsubmod///frotz// &&
198 git submodule init
Jonathan Niedera76c9442010-04-10 00:39:04 -0500199 ) &&
200
201 rm -f heads head untracked &&
202 inspect addtest/slashslashsubmod/frotz ../../.. &&
203 test_cmp expect heads &&
204 test_cmp expect head &&
205 test_cmp empty untracked
Michael J Gruberac8463d2009-03-03 16:08:20 +0100206'
207
Michael J Gruberdb75ada2009-03-03 16:08:21 +0100208test_expect_success 'submodule add with /.. in path' '
Jonathan Niedera76c9442010-04-10 00:39:04 -0500209 echo "refs/heads/master" >expect &&
210 >empty &&
211
Michael J Gruberac8463d2009-03-03 16:08:20 +0100212 (
213 cd addtest &&
214 git submodule add "$submodurl" dotdotsubmod/../realsubmod/frotz/.. &&
215 git submodule init
Jonathan Niedera76c9442010-04-10 00:39:04 -0500216 ) &&
217
218 rm -f heads head untracked &&
219 inspect addtest/realsubmod ../.. &&
220 test_cmp expect heads &&
221 test_cmp expect head &&
222 test_cmp empty untracked
Michael J Gruberac8463d2009-03-03 16:08:20 +0100223'
224
Michael J Gruberdb75ada2009-03-03 16:08:21 +0100225test_expect_success 'submodule add with ./, /.. and // in path' '
Jonathan Niedera76c9442010-04-10 00:39:04 -0500226 echo "refs/heads/master" >expect &&
227 >empty &&
228
Michael J Gruberac8463d2009-03-03 16:08:20 +0100229 (
230 cd addtest &&
231 git submodule add "$submodurl" dot/dotslashsubmod/./../..////realsubmod2/a/b/c/d/../../../../frotz//.. &&
232 git submodule init
Jonathan Niedera76c9442010-04-10 00:39:04 -0500233 ) &&
234
235 rm -f heads head untracked &&
236 inspect addtest/realsubmod2 ../.. &&
237 test_cmp expect heads &&
238 test_cmp expect head &&
239 test_cmp empty untracked
Michael J Gruberac8463d2009-03-03 16:08:20 +0100240'
241
John Keeping091a6eb2013-06-16 15:18:18 +0100242test_expect_success 'submodule add in subdirectory' '
243 echo "refs/heads/master" >expect &&
244 >empty &&
245
246 mkdir addtest/sub &&
247 (
248 cd addtest/sub &&
249 git submodule add "$submodurl" ../realsubmod3 &&
250 git submodule init
251 ) &&
252
253 rm -f heads head untracked &&
254 inspect addtest/realsubmod3 ../.. &&
255 test_cmp expect heads &&
256 test_cmp expect head &&
257 test_cmp empty untracked
258'
259
260test_expect_success 'submodule add in subdirectory with relative path should fail' '
261 (
262 cd addtest/sub &&
263 test_must_fail git submodule add ../../ submod3 2>../../output.err
264 ) &&
265 test_i18ngrep toplevel output.err
266'
267
Jonathan Niederce8b54d2010-04-10 00:39:41 -0500268test_expect_success 'setup - add an example entry to .gitmodules' '
Jeff Kingf7e87142014-03-20 19:17:01 -0400269 git config --file=.gitmodules submodule.example.url git://example.com/init.git
Jonathan Niederce8b54d2010-04-10 00:39:41 -0500270'
271
Lars Hjemli941987a2007-06-11 21:12:24 +0200272test_expect_success 'status should fail for unmapped paths' '
Jonathan Niederce8b54d2010-04-10 00:39:41 -0500273 test_must_fail git submodule status
274'
275
276test_expect_success 'setup - map path in .gitmodules' '
277 cat <<\EOF >expect &&
278[submodule "example"]
279 url = git://example.com/init.git
280 path = init
281EOF
282
Jeff Kingf7e87142014-03-20 19:17:01 -0400283 git config --file=.gitmodules submodule.example.path init &&
Jonathan Niederce8b54d2010-04-10 00:39:41 -0500284
285 test_cmp expect .gitmodules
Lars Hjemli88961ef2007-06-02 03:27:42 +0200286'
287
288test_expect_success 'status should only print one line' '
Jonathan Niederce8b54d2010-04-10 00:39:41 -0500289 git submodule status >lines &&
Stefano Lattarini3fb04592012-04-11 13:24:01 +0200290 test_line_count = 1 lines
Jonathan Niederce8b54d2010-04-10 00:39:41 -0500291'
292
293test_expect_success 'setup - fetch commit name from submodule' '
294 rev1=$(cd .subrepo && git rev-parse HEAD) &&
295 printf "rev1: %s\n" "$rev1" &&
296 test -n "$rev1"
Lars Hjemli88961ef2007-06-02 03:27:42 +0200297'
298
299test_expect_success 'status should initially be "missing"' '
Jonathan Niederce8b54d2010-04-10 00:39:41 -0500300 git submodule status >lines &&
301 grep "^-$rev1" lines
Lars Hjemli88961ef2007-06-02 03:27:42 +0200302'
303
Lars Hjemli211b7f12007-06-06 11:13:02 +0200304test_expect_success 'init should register submodule url in .git/config' '
Jonathan Niederce8b54d2010-04-10 00:39:41 -0500305 echo git://example.com/init.git >expect &&
306
Nanako Shiraishi47a528a2008-09-03 17:59:33 +0900307 git submodule init &&
Jonathan Niederce8b54d2010-04-10 00:39:41 -0500308 git config submodule.example.url >url &&
309 git config submodule.example.url ./.subrepo &&
310
311 test_cmp expect url
Lars Hjemli211b7f12007-06-06 11:13:02 +0200312'
313
Heiko Voigtbe9d0a32012-08-14 22:35:27 +0200314test_failure_with_unknown_submodule () {
315 test_must_fail git submodule $1 no-such-submodule 2>output.err &&
316 grep "^error: .*no-such-submodule" output.err
317}
318
319test_expect_success 'init should fail with unknown submodule' '
320 test_failure_with_unknown_submodule init
321'
322
323test_expect_success 'update should fail with unknown submodule' '
324 test_failure_with_unknown_submodule update
325'
326
327test_expect_success 'status should fail with unknown submodule' '
328 test_failure_with_unknown_submodule status
329'
330
331test_expect_success 'sync should fail with unknown submodule' '
332 test_failure_with_unknown_submodule sync
333'
334
Lars Hjemli211b7f12007-06-06 11:13:02 +0200335test_expect_success 'update should fail when path is used by a file' '
Jonathan Niederce8b54d2010-04-10 00:39:41 -0500336 echo hello >expect &&
337
Junio C Hamanoa2d93ae2008-01-15 03:13:55 -0800338 echo "hello" >init &&
Jonathan Niederce8b54d2010-04-10 00:39:41 -0500339 test_must_fail git submodule update &&
340
341 test_cmp expect init
Lars Hjemli88961ef2007-06-02 03:27:42 +0200342'
343
Lars Hjemli211b7f12007-06-06 11:13:02 +0200344test_expect_success 'update should fail when path is used by a nonempty directory' '
Jonathan Niederce8b54d2010-04-10 00:39:41 -0500345 echo hello >expect &&
346
347 rm -fr init &&
Junio C Hamanoa2d93ae2008-01-15 03:13:55 -0800348 mkdir init &&
349 echo "hello" >init/a &&
Jonathan Niederce8b54d2010-04-10 00:39:41 -0500350
351 test_must_fail git submodule update &&
352
353 test_cmp expect init/a
Lars Hjemli88961ef2007-06-02 03:27:42 +0200354'
355
Lars Hjemli211b7f12007-06-06 11:13:02 +0200356test_expect_success 'update should work when path is an empty dir' '
Jonathan Niederce8b54d2010-04-10 00:39:41 -0500357 rm -fr init &&
358 rm -f head-sha1 &&
359 echo "$rev1" >expect &&
360
Junio C Hamanoa2d93ae2008-01-15 03:13:55 -0800361 mkdir init &&
Jens Lehmann7e604072011-07-26 23:39:03 +0200362 git submodule update -q >update.out &&
Junio C Hamanoca8d1482013-06-09 11:29:20 -0700363 test_must_be_empty update.out &&
Jonathan Niederce8b54d2010-04-10 00:39:41 -0500364
365 inspect init &&
366 test_cmp expect head-sha1
Lars Hjemli88961ef2007-06-02 03:27:42 +0200367'
368
Lars Hjemli211b7f12007-06-06 11:13:02 +0200369test_expect_success 'status should be "up-to-date" after update' '
Jonathan Niederce8b54d2010-04-10 00:39:41 -0500370 git submodule status >list &&
371 grep "^ $rev1" list
Lars Hjemli88961ef2007-06-02 03:27:42 +0200372'
373
John Keeping091a6eb2013-06-16 15:18:18 +0100374test_expect_success 'status "up-to-date" from subdirectory' '
375 mkdir -p sub &&
376 (
377 cd sub &&
378 git submodule status >../list
379 ) &&
380 grep "^ $rev1" list &&
381 grep "\\.\\./init" list
382'
383
384test_expect_success 'status "up-to-date" from subdirectory with path' '
385 mkdir -p sub &&
386 (
387 cd sub &&
388 git submodule status ../init >../list
389 ) &&
390 grep "^ $rev1" list &&
391 grep "\\.\\./init" list
392'
393
Lars Hjemli88961ef2007-06-02 03:27:42 +0200394test_expect_success 'status should be "modified" after submodule commit' '
Jonathan Niederce8b54d2010-04-10 00:39:41 -0500395 (
396 cd init &&
397 echo b >b &&
398 git add b &&
399 git commit -m "submodule commit 2"
400 ) &&
401
402 rev2=$(cd init && git rev-parse HEAD) &&
403 test -n "$rev2" &&
404 git submodule status >list &&
405
406 grep "^+$rev2" list
Lars Hjemli88961ef2007-06-02 03:27:42 +0200407'
408
409test_expect_success 'the --cached sha1 should be rev1' '
Jonathan Niederce8b54d2010-04-10 00:39:41 -0500410 git submodule --cached status >list &&
411 grep "^+$rev1" list
Lars Hjemli88961ef2007-06-02 03:27:42 +0200412'
413
Sven Verdoolaege57011152007-09-08 12:30:22 +0200414test_expect_success 'git diff should report the SHA1 of the new submodule commit' '
Jonathan Niederce8b54d2010-04-10 00:39:41 -0500415 git diff >diff &&
416 grep "^+Subproject commit $rev2" diff
Sven Verdoolaege57011152007-09-08 12:30:22 +0200417'
418
Lars Hjemli88961ef2007-06-02 03:27:42 +0200419test_expect_success 'update should checkout rev1' '
Jonathan Niederce8b54d2010-04-10 00:39:41 -0500420 rm -f head-sha1 &&
421 echo "$rev1" >expect &&
422
Nanako Shiraishi47a528a2008-09-03 17:59:33 +0900423 git submodule update init &&
Jonathan Niederce8b54d2010-04-10 00:39:41 -0500424 inspect init &&
425
426 test_cmp expect head-sha1
Lars Hjemli88961ef2007-06-02 03:27:42 +0200427'
428
429test_expect_success 'status should be "up-to-date" after update' '
Jonathan Niederce8b54d2010-04-10 00:39:41 -0500430 git submodule status >list &&
431 grep "^ $rev1" list
Lars Hjemli88961ef2007-06-02 03:27:42 +0200432'
433
Sven Verdoolaege0cf73752007-07-17 20:28:28 +0200434test_expect_success 'checkout superproject with subproject already present' '
Nanako Shiraishi47a528a2008-09-03 17:59:33 +0900435 git checkout initial &&
436 git checkout master
Sven Verdoolaege0cf73752007-07-17 20:28:28 +0200437'
438
Sven Verdoolaegee06c5a62007-08-15 19:22:09 +0200439test_expect_success 'apply submodule diff' '
Jonathan Niederce8b54d2010-04-10 00:39:41 -0500440 >empty &&
441
Sven Verdoolaegee06c5a62007-08-15 19:22:09 +0200442 git branch second &&
443 (
Junio C Hamanoa2d93ae2008-01-15 03:13:55 -0800444 cd init &&
Sven Verdoolaegee06c5a62007-08-15 19:22:09 +0200445 echo s >s &&
446 git add s &&
447 git commit -m "change subproject"
448 ) &&
Junio C Hamanoa2d93ae2008-01-15 03:13:55 -0800449 git update-index --add init &&
Nanako Shiraishi47a528a2008-09-03 17:59:33 +0900450 git commit -m "change init" &&
451 git format-patch -1 --stdout >P.diff &&
Sven Verdoolaegee06c5a62007-08-15 19:22:09 +0200452 git checkout second &&
453 git apply --index P.diff &&
Jonathan Niederce8b54d2010-04-10 00:39:41 -0500454
455 git diff --cached master >staged &&
456 test_cmp empty staged
Sven Verdoolaegee06c5a62007-08-15 19:22:09 +0200457'
458
Johannes Schindelinbe4d2c82008-05-16 11:23:03 +0100459test_expect_success 'update --init' '
Johannes Schindelinbe4d2c82008-05-16 11:23:03 +0100460 mv init init2 &&
461 git config -f .gitmodules submodule.example.url "$(pwd)/init2" &&
Jonathan Niederce8b54d2010-04-10 00:39:41 -0500462 git config --remove-section submodule.example &&
463 test_must_fail git config submodule.example.url &&
464
Johannes Schindelinbe4d2c82008-05-16 11:23:03 +0100465 git submodule update init > update.out &&
Jonathan Niederce8b54d2010-04-10 00:39:41 -0500466 cat update.out &&
Ævar Arnfjörð Bjarmason1c2ef662011-05-21 18:44:08 +0000467 test_i18ngrep "not initialized" update.out &&
Fredrik Gustafssonabc06822011-08-15 23:17:46 +0200468 test_must_fail git rev-parse --resolve-git-dir init/.git &&
Jonathan Niederce8b54d2010-04-10 00:39:41 -0500469
Johannes Schindelinbe4d2c82008-05-16 11:23:03 +0100470 git submodule update --init init &&
Fredrik Gustafssonabc06822011-08-15 23:17:46 +0200471 git rev-parse --resolve-git-dir init/.git
Johannes Schindelinbe4d2c82008-05-16 11:23:03 +0100472'
473
John Keeping091a6eb2013-06-16 15:18:18 +0100474test_expect_success 'update --init from subdirectory' '
475 mv init init2 &&
476 git config -f .gitmodules submodule.example.url "$(pwd)/init2" &&
477 git config --remove-section submodule.example &&
478 test_must_fail git config submodule.example.url &&
479
480 mkdir -p sub &&
481 (
482 cd sub &&
483 git submodule update ../init >update.out &&
484 cat update.out &&
485 test_i18ngrep "not initialized" update.out &&
486 test_must_fail git rev-parse --resolve-git-dir ../init/.git &&
487
488 git submodule update --init ../init
489 ) &&
490 git rev-parse --resolve-git-dir init/.git
491'
492
Johannes Schindelin2ce53f92009-01-02 19:08:40 +0100493test_expect_success 'do not add files from a submodule' '
494
495 git reset --hard &&
496 test_must_fail git add init/a
497
498'
499
John Keeping2c63d6e2013-09-12 20:25:01 +0100500test_expect_success 'gracefully add/reset submodule with a trailing slash' '
Johannes Schindelin2ce53f92009-01-02 19:08:40 +0100501
502 git reset --hard &&
503 git commit -m "commit subproject" init &&
504 (cd init &&
505 echo b > a) &&
506 git add init/ &&
507 git diff --exit-code --cached init &&
508 commit=$(cd init &&
509 git commit -m update a >/dev/null &&
510 git rev-parse HEAD) &&
511 git add init/ &&
512 test_must_fail git diff --exit-code --cached init &&
513 test $commit = $(git ls-files --stage |
John Keeping2c63d6e2013-09-12 20:25:01 +0100514 sed -n "s/^160000 \([^ ]*\).*/\1/p") &&
515 git reset init/ &&
516 git diff --exit-code --cached init
Johannes Schindelin2ce53f92009-01-02 19:08:40 +0100517
518'
519
Johannes Schindelinf3670a52009-02-07 14:43:03 +0100520test_expect_success 'ls-files gracefully handles trailing slash' '
521
522 test "init" = "$(git ls-files init/)"
523
524'
525
Peter Collingbournec5e558a2010-01-11 02:59:54 +0000526test_expect_success 'moving to a commit without submodule does not leave empty dir' '
527 rm -rf init &&
528 mkdir init &&
529 git reset --hard &&
530 git checkout initial &&
531 test ! -d init &&
532 git checkout second
533'
534
Ramkumar Ramachandraaf9c9f92012-09-22 16:57:59 +0530535test_expect_success 'submodule <invalid-subcommand> fails' '
536 test_must_fail git submodule no-such-subcommand
Johannes Schindelin496917b2009-02-07 14:43:15 +0100537'
538
Jens Lehmann1414e572009-09-22 17:10:12 +0200539test_expect_success 'add submodules without specifying an explicit path' '
540 mkdir repo &&
Jonathan Nieder18a82692010-09-06 20:42:54 -0500541 (
542 cd repo &&
543 git init &&
544 echo r >r &&
545 git add r &&
546 git commit -m "repo commit 1"
Jens Lehmannfd4ec4f2010-09-06 20:39:54 +0200547 ) &&
Jens Lehmann1414e572009-09-22 17:10:12 +0200548 git clone --bare repo/ bare.git &&
Jens Lehmann69e72362010-12-05 00:27:35 +0100549 (
550 cd addtest &&
551 git submodule add "$submodurl/repo" &&
552 git config -f .gitmodules submodule.repo.path repo &&
553 git submodule add "$submodurl/bare.git" &&
554 git config -f .gitmodules submodule.bare.path bare
555 )
556'
557
558test_expect_success 'add should fail when path is used by a file' '
559 (
560 cd addtest &&
561 touch file &&
562 test_must_fail git submodule add "$submodurl/repo" file
563 )
564'
565
566test_expect_success 'add should fail when path is used by an existing directory' '
567 (
568 cd addtest &&
569 mkdir empty-dir &&
570 test_must_fail git submodule add "$submodurl/repo" empty-dir
571 )
Jens Lehmann1414e572009-09-22 17:10:12 +0200572'
573
Jens Lehmann4d689322011-06-06 21:58:04 +0200574test_expect_success 'use superproject as upstream when path is relative and no url is set there' '
Jens Lehmann8537f0e2011-06-06 21:57:01 +0200575 (
576 cd addtest &&
Jens Lehmann4d689322011-06-06 21:58:04 +0200577 git submodule add ../repo relative &&
578 test "$(git config -f .gitmodules submodule.relative.url)" = ../repo &&
579 git submodule sync relative &&
580 test "$(git config submodule.relative.url)" = "$submodurl/repo"
Jens Lehmann8537f0e2011-06-06 21:57:01 +0200581 )
582'
583
Thomas Rastea640cc2011-01-10 11:37:26 +0100584test_expect_success 'set up for relative path tests' '
585 mkdir reltest &&
586 (
587 cd reltest &&
588 git init &&
589 mkdir sub &&
590 (
591 cd sub &&
592 git init &&
593 test_commit foo
594 ) &&
595 git add sub &&
596 git config -f .gitmodules submodule.sub.path sub &&
597 git config -f .gitmodules submodule.sub.url ../subrepo &&
Jon Seymour712693e2012-06-03 19:46:47 +1000598 cp .git/config pristine-.git-config &&
599 cp .gitmodules pristine-.gitmodules
Thomas Rastea640cc2011-01-10 11:37:26 +0100600 )
601'
602
Jon Seymour712693e2012-06-03 19:46:47 +1000603test_expect_success '../subrepo works with URL - ssh://hostname/repo' '
Thomas Rastea640cc2011-01-10 11:37:26 +0100604 (
605 cd reltest &&
606 cp pristine-.git-config .git/config &&
Jon Seymour712693e2012-06-03 19:46:47 +1000607 cp pristine-.gitmodules .gitmodules &&
Thomas Rastea640cc2011-01-10 11:37:26 +0100608 git config remote.origin.url ssh://hostname/repo &&
609 git submodule init &&
610 test "$(git config submodule.sub.url)" = ssh://hostname/subrepo
611 )
612'
613
Jon Seymour712693e2012-06-03 19:46:47 +1000614test_expect_success '../subrepo works with port-qualified URL - ssh://hostname:22/repo' '
615 (
616 cd reltest &&
617 cp pristine-.git-config .git/config &&
618 cp pristine-.gitmodules .gitmodules &&
619 git config remote.origin.url ssh://hostname:22/repo &&
620 git submodule init &&
621 test "$(git config submodule.sub.url)" = ssh://hostname:22/subrepo
622 )
623'
624
Johannes Sixtc517e732012-06-14 14:10:27 +0200625# About the choice of the path in the next test:
626# - double-slash side-steps path mangling issues on Windows
627# - it is still an absolute local path
628# - there cannot be a server with a blank in its name just in case the
629# path is used erroneously to access a //server/share style path
630test_expect_success '../subrepo path works with local path - //somewhere else/repo' '
Jon Seymour712693e2012-06-03 19:46:47 +1000631 (
632 cd reltest &&
633 cp pristine-.git-config .git/config &&
634 cp pristine-.gitmodules .gitmodules &&
Johannes Sixtc517e732012-06-14 14:10:27 +0200635 git config remote.origin.url "//somewhere else/repo" &&
Jon Seymour712693e2012-06-03 19:46:47 +1000636 git submodule init &&
Johannes Sixtc517e732012-06-14 14:10:27 +0200637 test "$(git config submodule.sub.url)" = "//somewhere else/subrepo"
Jon Seymour712693e2012-06-03 19:46:47 +1000638 )
639'
640
641test_expect_success '../subrepo works with file URL - file:///tmp/repo' '
642 (
643 cd reltest &&
644 cp pristine-.git-config .git/config &&
645 cp pristine-.gitmodules .gitmodules &&
646 git config remote.origin.url file:///tmp/repo &&
647 git submodule init &&
648 test "$(git config submodule.sub.url)" = file:///tmp/subrepo
649 )
650'
651
652test_expect_success '../subrepo works with helper URL- helper:://hostname/repo' '
653 (
654 cd reltest &&
655 cp pristine-.git-config .git/config &&
656 cp pristine-.gitmodules .gitmodules &&
657 git config remote.origin.url helper:://hostname/repo &&
658 git submodule init &&
659 test "$(git config submodule.sub.url)" = helper:://hostname/subrepo
660 )
661'
662
663test_expect_success '../subrepo works with scp-style URL - user@host:repo' '
Thomas Rastea640cc2011-01-10 11:37:26 +0100664 (
665 cd reltest &&
666 cp pristine-.git-config .git/config &&
667 git config remote.origin.url user@host:repo &&
668 git submodule init &&
669 test "$(git config submodule.sub.url)" = user@host:subrepo
670 )
671'
672
Jon Seymour712693e2012-06-03 19:46:47 +1000673test_expect_success '../subrepo works with scp-style URL - user@host:path/to/repo' '
674 (
675 cd reltest &&
676 cp pristine-.git-config .git/config &&
677 cp pristine-.gitmodules .gitmodules &&
678 git config remote.origin.url user@host:path/to/repo &&
679 git submodule init &&
680 test "$(git config submodule.sub.url)" = user@host:path/to/subrepo
681 )
682'
683
Jon Seymour758615e2012-06-06 21:57:30 +1000684test_expect_success '../subrepo works with relative local path - foo' '
Jon Seymour49301c62012-06-03 19:46:48 +1000685 (
686 cd reltest &&
687 cp pristine-.git-config .git/config &&
688 cp pristine-.gitmodules .gitmodules &&
689 git config remote.origin.url foo &&
690 # actual: fails with an error
691 git submodule init &&
692 test "$(git config submodule.sub.url)" = subrepo
693 )
694'
695
Jon Seymour712693e2012-06-03 19:46:47 +1000696test_expect_success '../subrepo works with relative local path - foo/bar' '
697 (
698 cd reltest &&
699 cp pristine-.git-config .git/config &&
700 cp pristine-.gitmodules .gitmodules &&
701 git config remote.origin.url foo/bar &&
702 git submodule init &&
703 test "$(git config submodule.sub.url)" = foo/subrepo
704 )
705'
706
Jon Seymour758615e2012-06-06 21:57:30 +1000707test_expect_success '../subrepo works with relative local path - ./foo' '
Jon Seymour49301c62012-06-03 19:46:48 +1000708 (
709 cd reltest &&
710 cp pristine-.git-config .git/config &&
711 cp pristine-.gitmodules .gitmodules &&
712 git config remote.origin.url ./foo &&
713 git submodule init &&
714 test "$(git config submodule.sub.url)" = subrepo
715 )
716'
717
Jon Seymour758615e2012-06-06 21:57:30 +1000718test_expect_success '../subrepo works with relative local path - ./foo/bar' '
Jon Seymour49301c62012-06-03 19:46:48 +1000719 (
720 cd reltest &&
721 cp pristine-.git-config .git/config &&
722 cp pristine-.gitmodules .gitmodules &&
723 git config remote.origin.url ./foo/bar &&
724 git submodule init &&
725 test "$(git config submodule.sub.url)" = foo/subrepo
726 )
727'
728
Jon Seymour712693e2012-06-03 19:46:47 +1000729test_expect_success '../subrepo works with relative local path - ../foo' '
730 (
731 cd reltest &&
732 cp pristine-.git-config .git/config &&
733 cp pristine-.gitmodules .gitmodules &&
734 git config remote.origin.url ../foo &&
735 git submodule init &&
736 test "$(git config submodule.sub.url)" = ../subrepo
737 )
738'
739
740test_expect_success '../subrepo works with relative local path - ../foo/bar' '
741 (
742 cd reltest &&
743 cp pristine-.git-config .git/config &&
744 cp pristine-.gitmodules .gitmodules &&
745 git config remote.origin.url ../foo/bar &&
746 git submodule init &&
747 test "$(git config submodule.sub.url)" = ../foo/subrepo
748 )
749'
750
751test_expect_success '../bar/a/b/c works with relative local path - ../foo/bar.git' '
752 (
753 cd reltest &&
754 cp pristine-.git-config .git/config &&
755 cp pristine-.gitmodules .gitmodules &&
756 mkdir -p a/b/c &&
757 (cd a/b/c; git init) &&
758 git config remote.origin.url ../foo/bar.git &&
759 git submodule add ../bar/a/b/c ./a/b/c &&
760 git submodule init &&
761 test "$(git config submodule.a/b/c.url)" = ../foo/bar/a/b/c
762 )
763'
764
Jens Lehmannd75219b2012-03-04 22:15:08 +0100765test_expect_success 'moving the superproject does not break submodules' '
766 (
767 cd addtest &&
768 git submodule status >expect
769 )
770 mv addtest addtest2 &&
771 (
772 cd addtest2 &&
773 git submodule status >actual &&
774 test_cmp expect actual
775 )
776'
777
Jens Lehmann73b08982012-09-30 01:05:58 +0200778test_expect_success 'submodule add --name allows to replace a submodule with another at the same path' '
779 (
780 cd addtest2 &&
781 (
782 cd repo &&
783 echo "$submodurl/repo" >expect &&
784 git config remote.origin.url >actual &&
785 test_cmp expect actual &&
786 echo "gitdir: ../.git/modules/repo" >expect &&
787 test_cmp expect .git
788 ) &&
789 rm -rf repo &&
790 git rm repo &&
791 git submodule add -q --name repo_new "$submodurl/bare.git" repo >actual &&
Junio C Hamanoca8d1482013-06-09 11:29:20 -0700792 test_must_be_empty actual &&
Jens Lehmann73b08982012-09-30 01:05:58 +0200793 echo "gitdir: ../.git/modules/submod" >expect &&
794 test_cmp expect submod/.git &&
795 (
796 cd repo &&
797 echo "$submodurl/bare.git" >expect &&
798 git config remote.origin.url >actual &&
799 test_cmp expect actual &&
800 echo "gitdir: ../.git/modules/repo_new" >expect &&
801 test_cmp expect .git
802 ) &&
803 echo "repo" >expect &&
Jens Lehmann95c16412013-08-06 21:15:25 +0200804 test_must_fail git config -f .gitmodules submodule.repo.path &&
Jens Lehmann73b08982012-09-30 01:05:58 +0200805 git config -f .gitmodules submodule.repo_new.path >actual &&
806 test_cmp expect actual&&
807 echo "$submodurl/repo" >expect &&
Jens Lehmann95c16412013-08-06 21:15:25 +0200808 test_must_fail git config -f .gitmodules submodule.repo.url &&
Jens Lehmann73b08982012-09-30 01:05:58 +0200809 echo "$submodurl/bare.git" >expect &&
810 git config -f .gitmodules submodule.repo_new.url >actual &&
811 test_cmp expect actual &&
812 echo "$submodurl/repo" >expect &&
813 git config submodule.repo.url >actual &&
814 test_cmp expect actual &&
815 echo "$submodurl/bare.git" >expect &&
816 git config submodule.repo_new.url >actual &&
817 test_cmp expect actual
818 )
819'
820
Jens Lehmann4b7c2862012-09-30 23:01:29 +0200821test_expect_success 'submodule add with an existing name fails unless forced' '
822 (
823 cd addtest2 &&
824 rm -rf repo &&
825 git rm repo &&
826 test_must_fail git submodule add -q --name repo_new "$submodurl/repo.git" repo &&
827 test ! -d repo &&
Jens Lehmann95c16412013-08-06 21:15:25 +0200828 test_must_fail git config -f .gitmodules submodule.repo_new.path &&
829 test_must_fail git config -f .gitmodules submodule.repo_new.url &&
Jens Lehmann4b7c2862012-09-30 23:01:29 +0200830 echo "$submodurl/bare.git" >expect &&
831 git config submodule.repo_new.url >actual &&
832 test_cmp expect actual &&
833 git submodule add -f -q --name repo_new "$submodurl/repo.git" repo &&
834 test -d repo &&
835 echo "repo" >expect &&
836 git config -f .gitmodules submodule.repo_new.path >actual &&
837 test_cmp expect actual&&
838 echo "$submodurl/repo.git" >expect &&
839 git config -f .gitmodules submodule.repo_new.url >actual &&
840 test_cmp expect actual &&
841 echo "$submodurl/repo.git" >expect &&
842 git config submodule.repo_new.url >actual &&
843 test_cmp expect actual
844 )
845'
846
Jens Lehmanncf419822013-03-04 22:20:24 +0100847test_expect_success 'set up a second submodule' '
848 git submodule add ./init2 example2 &&
849 git commit -m "submodule example2 added"
850'
851
852test_expect_success 'submodule deinit should remove the whole submodule section from .git/config' '
853 git config submodule.example.foo bar &&
854 git config submodule.example2.frotz nitfol &&
855 git submodule deinit init &&
856 test -z "$(git config --get-regexp "submodule\.example\.")" &&
857 test -n "$(git config --get-regexp "submodule\.example2\.")" &&
858 test -f example2/.git &&
859 rmdir init
860'
861
John Keeping091a6eb2013-06-16 15:18:18 +0100862test_expect_success 'submodule deinit from subdirectory' '
863 git submodule update --init &&
864 git config submodule.example.foo bar &&
865 mkdir -p sub &&
866 (
867 cd sub &&
868 git submodule deinit ../init >../output
869 ) &&
870 grep "\\.\\./init" output &&
871 test -z "$(git config --get-regexp "submodule\.example\.")" &&
872 test -n "$(git config --get-regexp "submodule\.example2\.")" &&
873 test -f example2/.git &&
874 rmdir init
875'
876
Jens Lehmanncf419822013-03-04 22:20:24 +0100877test_expect_success 'submodule deinit . deinits all initialized submodules' '
878 git submodule update --init &&
879 git config submodule.example.foo bar &&
880 git config submodule.example2.frotz nitfol &&
881 test_must_fail git submodule deinit &&
Jens Lehmann7b294bf2013-04-01 21:02:00 +0200882 git submodule deinit . >actual &&
Jens Lehmanncf419822013-03-04 22:20:24 +0100883 test -z "$(git config --get-regexp "submodule\.example\.")" &&
884 test -z "$(git config --get-regexp "submodule\.example2\.")" &&
Jens Lehmann7b294bf2013-04-01 21:02:00 +0200885 test_i18ngrep "Cleared directory .init" actual &&
886 test_i18ngrep "Cleared directory .example2" actual &&
Jens Lehmanncf419822013-03-04 22:20:24 +0100887 rmdir init example2
888'
889
890test_expect_success 'submodule deinit deinits a submodule when its work tree is missing or empty' '
891 git submodule update --init &&
892 rm -rf init example2/* example2/.git &&
Jens Lehmann7b294bf2013-04-01 21:02:00 +0200893 git submodule deinit init example2 >actual &&
Jens Lehmanncf419822013-03-04 22:20:24 +0100894 test -z "$(git config --get-regexp "submodule\.example\.")" &&
895 test -z "$(git config --get-regexp "submodule\.example2\.")" &&
Jens Lehmann7b294bf2013-04-01 21:02:00 +0200896 test_i18ngrep ! "Cleared directory .init" actual &&
897 test_i18ngrep "Cleared directory .example2" actual &&
Jens Lehmanncf419822013-03-04 22:20:24 +0100898 rmdir init
899'
900
901test_expect_success 'submodule deinit fails when the submodule contains modifications unless forced' '
902 git submodule update --init &&
903 echo X >>init/s &&
904 test_must_fail git submodule deinit init &&
905 test -n "$(git config --get-regexp "submodule\.example\.")" &&
906 test -f example2/.git &&
Jens Lehmann7b294bf2013-04-01 21:02:00 +0200907 git submodule deinit -f init >actual &&
Jens Lehmanncf419822013-03-04 22:20:24 +0100908 test -z "$(git config --get-regexp "submodule\.example\.")" &&
Jens Lehmann7b294bf2013-04-01 21:02:00 +0200909 test_i18ngrep "Cleared directory .init" actual &&
Jens Lehmanncf419822013-03-04 22:20:24 +0100910 rmdir init
911'
912
913test_expect_success 'submodule deinit fails when the submodule contains untracked files unless forced' '
914 git submodule update --init &&
915 echo X >>init/untracked &&
916 test_must_fail git submodule deinit init &&
917 test -n "$(git config --get-regexp "submodule\.example\.")" &&
918 test -f example2/.git &&
Jens Lehmann7b294bf2013-04-01 21:02:00 +0200919 git submodule deinit -f init >actual &&
Jens Lehmanncf419822013-03-04 22:20:24 +0100920 test -z "$(git config --get-regexp "submodule\.example\.")" &&
Jens Lehmann7b294bf2013-04-01 21:02:00 +0200921 test_i18ngrep "Cleared directory .init" actual &&
Jens Lehmanncf419822013-03-04 22:20:24 +0100922 rmdir init
923'
924
925test_expect_success 'submodule deinit fails when the submodule HEAD does not match unless forced' '
926 git submodule update --init &&
927 (
928 cd init &&
929 git checkout HEAD^
930 ) &&
931 test_must_fail git submodule deinit init &&
932 test -n "$(git config --get-regexp "submodule\.example\.")" &&
933 test -f example2/.git &&
Jens Lehmann7b294bf2013-04-01 21:02:00 +0200934 git submodule deinit -f init >actual &&
Jens Lehmanncf419822013-03-04 22:20:24 +0100935 test -z "$(git config --get-regexp "submodule\.example\.")" &&
Jens Lehmann7b294bf2013-04-01 21:02:00 +0200936 test_i18ngrep "Cleared directory .init" actual &&
Jens Lehmanncf419822013-03-04 22:20:24 +0100937 rmdir init
938'
939
940test_expect_success 'submodule deinit is silent when used on an uninitialized submodule' '
941 git submodule update --init &&
942 git submodule deinit init >actual &&
943 test_i18ngrep "Submodule .example. (.*) unregistered for path .init" actual &&
Jens Lehmann7b294bf2013-04-01 21:02:00 +0200944 test_i18ngrep "Cleared directory .init" actual &&
Jens Lehmanncf419822013-03-04 22:20:24 +0100945 git submodule deinit init >actual &&
946 test_i18ngrep ! "Submodule .example. (.*) unregistered for path .init" actual &&
Jens Lehmann7b294bf2013-04-01 21:02:00 +0200947 test_i18ngrep "Cleared directory .init" actual &&
Jens Lehmanncf419822013-03-04 22:20:24 +0100948 git submodule deinit . >actual &&
949 test_i18ngrep ! "Submodule .example. (.*) unregistered for path .init" actual &&
950 test_i18ngrep "Submodule .example2. (.*) unregistered for path .example2" actual &&
Jens Lehmann7b294bf2013-04-01 21:02:00 +0200951 test_i18ngrep "Cleared directory .init" actual &&
Jens Lehmanncf419822013-03-04 22:20:24 +0100952 git submodule deinit . >actual &&
953 test_i18ngrep ! "Submodule .example. (.*) unregistered for path .init" actual &&
954 test_i18ngrep ! "Submodule .example2. (.*) unregistered for path .example2" actual &&
Jens Lehmann7b294bf2013-04-01 21:02:00 +0200955 test_i18ngrep "Cleared directory .init" actual &&
Jens Lehmanncf419822013-03-04 22:20:24 +0100956 rmdir init example2
957'
958
959test_expect_success 'submodule deinit fails when submodule has a .git directory even when forced' '
960 git submodule update --init &&
961 (
962 cd init &&
963 rm .git &&
964 cp -R ../.git/modules/example .git &&
965 GIT_WORK_TREE=. git config --unset core.worktree
966 ) &&
967 test_must_fail git submodule deinit init &&
968 test_must_fail git submodule deinit -f init &&
969 test -d init/.git &&
970 test -n "$(git config --get-regexp "submodule\.example\.")"
971'
972
Torsten Bögershausenbed94702013-06-20 16:58:48 +0200973test_expect_success 'submodule with UTF-8 name' '
974 svname=$(printf "\303\245 \303\244\303\266") &&
975 mkdir "$svname" &&
Fredrik Gustafsson74671242013-06-14 02:26:02 +0200976 (
Torsten Bögershausenbed94702013-06-20 16:58:48 +0200977 cd "$svname" &&
Fredrik Gustafsson74671242013-06-14 02:26:02 +0200978 git init &&
Torsten Bögershausenbed94702013-06-20 16:58:48 +0200979 >sub &&
980 git add sub &&
Fredrik Gustafsson74671242013-06-14 02:26:02 +0200981 git commit -m "init sub"
Torsten Bögershausenbed94702013-06-20 16:58:48 +0200982 ) &&
Torsten Bögershausenbed94702013-06-20 16:58:48 +0200983 git submodule add ./"$svname" &&
984 git submodule >&2 &&
985 test -n "$(git submodule | grep "$svname")"
Fredrik Gustafsson74671242013-06-14 02:26:02 +0200986'
Junio C Hamano2bb7afa2013-07-15 10:28:48 -0700987
Fredrik Gustafsson275cd182013-07-02 23:42:56 +0200988test_expect_success 'submodule add clone shallow submodule' '
989 mkdir super &&
990 pwd=$(pwd)
991 (
992 cd super &&
993 git init &&
994 git submodule add --depth=1 file://"$pwd"/example2 submodule &&
995 (
996 cd submodule &&
997 test 1 = $(git log --oneline | wc -l)
998 )
999 )
1000'
1001
1002
Lars Hjemli88961ef2007-06-02 03:27:42 +02001003test_done