]> git.ipfire.org Git - thirdparty/git.git/blame - git-submodule.sh
doc: typeset long command-line options as literal
[thirdparty/git.git] / git-submodule.sh
CommitLineData
70c7ac22
LH
1#!/bin/sh
2#
4c8a9db6 3# git-submodule.sh: add, init, update or list git submodules
70c7ac22
LH
4#
5# Copyright (c) 2007 Lars Hjemli
6
1d5bec8b 7dashless=$(basename "$0" | sed -e 's/-/ /')
681b036f 8USAGE="[--quiet] add [-b <branch>] [-f|--force] [--name <name>] [--reference <repository>] [--] <repository> [<path>]
64b19ffe 9 or: $dashless [--quiet] status [--cached] [--recursive] [--] [<path>...]
1d5bec8b 10 or: $dashless [--quiet] init [--] [<path>...]
f6a52799 11 or: $dashless [--quiet] deinit [-f|--force] (--all| [--] <path>...)
893a9764 12 or: $dashless [--quiet] update [--init] [--remote] [-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--reference <repository>] [--recursive] [--] [<path>...]
adc54235 13 or: $dashless [--quiet] summary [--cached|--files] [--summary-limit <n>] [commit] [--] [<path>...]
15fc56a8 14 or: $dashless [--quiet] foreach [--recursive] <command>
82f49f29 15 or: $dashless [--quiet] sync [--recursive] [--] [<path>...]"
8f321a39 16OPTIONS_SPEC=
091a6eb0 17SUBDIRECTORY_OK=Yes
70c7ac22 18. git-sh-setup
d0ad8251 19. git-sh-i18n
98fcf840 20. git-parse-remote
70c7ac22 21require_work_tree
091a6eb0
JK
22wt_prefix=$(git rev-parse --show-prefix)
23cd_to_toplevel
70c7ac22 24
33cfccbb
JK
25# Restrict ourselves to a vanilla subset of protocols; the URLs
26# we get are under control of a remote repository, and we do not
27# want them kicking off arbitrary git-remote-* programs.
28#
29# If the user has already specified a set of allowed protocols,
30# we assume they know what they're doing and use that instead.
31: ${GIT_ALLOW_PROTOCOL=file:git:http:https:ssh}
32export GIT_ALLOW_PROTOCOL
33
5c08dbbd 34command=
ecda0723 35branch=
d27b876b 36force=
d92a3959 37reference=
70c7ac22 38cached=
48bb3033
GP
39recursive=
40init=
1c244f6e 41files=
06b1abb5 42remote=
31ca3ac3 43nofetch=
32948425 44update=
15fc56a8 45prefix=
73b0898d 46custom_name=
275cd184 47depth=
70c7ac22 48
967b2c66
JS
49# The function takes at most 2 arguments. The first argument is the
50# URL that navigates to the submodule origin repo. When relative, this URL
51# is relative to the superproject origin URL repo. The second up_path
52# argument, if specified, is the relative path that navigates
53# from the submodule working tree to the superproject working tree.
54#
55# The output of the function is the origin URL of the submodule.
56#
57# The output will either be an absolute URL or filesystem path (if the
58# superproject origin URL is an absolute URL or filesystem path,
59# respectively) or a relative file system path (if the superproject
60# origin URL is a relative file system path).
61#
62# When the output is a relative file system path, the path is either
63# relative to the submodule working tree, if up_path is specified, or to
64# the superproject working tree otherwise.
f31a522a
ML
65resolve_relative_url ()
66{
98fcf840 67 remote=$(get_default_remote)
8e7e6f39 68 remoteurl=$(git config "remote.$remote.url") ||
4d689320 69 remoteurl=$(pwd) # the repository is its own authoritative upstream
f31a522a 70 url="$1"
99b120af 71 remoteurl=${remoteurl%/}
ea640cc6 72 sep=/
967b2c66
JS
73 up_path="$2"
74
75 case "$remoteurl" in
76 *:*|/*)
77 is_relative=
78 ;;
758615e2
JS
79 ./*|../*)
80 is_relative=t
81 ;;
967b2c66
JS
82 *)
83 is_relative=t
758615e2 84 remoteurl="./$remoteurl"
967b2c66
JS
85 ;;
86 esac
87
f31a522a
ML
88 while test -n "$url"
89 do
90 case "$url" in
91 ../*)
92 url="${url#../}"
ea640cc6
TR
93 case "$remoteurl" in
94 */*)
95 remoteurl="${remoteurl%/*}"
96 ;;
97 *:*)
98 remoteurl="${remoteurl%:*}"
99 sep=:
100 ;;
101 *)
758615e2
JS
102 if test -z "$is_relative" || test "." = "$remoteurl"
103 then
104 die "$(eval_gettext "cannot strip one component off url '\$remoteurl'")"
105 else
106 remoteurl=.
107 fi
ea640cc6
TR
108 ;;
109 esac
f31a522a
ML
110 ;;
111 ./*)
112 url="${url#./}"
113 ;;
114 *)
115 break;;
116 esac
117 done
758615e2
JS
118 remoteurl="$remoteurl$sep${url%/}"
119 echo "${is_relative:+${up_path}}${remoteurl#./}"
f31a522a
ML
120}
121
091a6eb0
JK
122# Resolve a path to be relative to another path. This is intended for
123# converting submodule paths when git-submodule is run in a subdirectory
124# and only handles paths where the directory separator is '/'.
125#
126# The output is the first argument as a path relative to the second argument,
127# which defaults to $wt_prefix if it is omitted.
128relative_path ()
129{
130 local target curdir result
131 target=$1
132 curdir=${2-$wt_prefix}
133 curdir=${curdir%/}
134 result=
135
136 while test -n "$curdir"
137 do
138 case "$target" in
139 "$curdir/"*)
140 target=${target#"$curdir"/}
141 break
142 ;;
143 esac
144
145 result="${result}../"
146 if test "$curdir" = "${curdir%/*}"
147 then
148 curdir=
149 else
150 curdir="${curdir%/*}"
151 fi
152 done
153
154 echo "$result$target"
155}
156
be9d0a3a
HV
157die_if_unmatched ()
158{
159 if test "$1" = "#unmatched"
160 then
161 exit 1
162 fi
163}
164
88ce00c3
TK
165#
166# Print a submodule configuration setting
167#
168# $1 = submodule name
169# $2 = option name
170# $3 = default value
171#
172# Checks in the usual git-config places first (for overrides),
173# otherwise it falls back on .gitmodules. This allows you to
174# distribute project-wide defaults in .gitmodules, while still
175# customizing individual repositories if necessary. If the option is
176# not in .gitmodules either, print a default value.
177#
178get_submodule_config () {
179 name="$1"
180 option="$2"
181 default="$3"
182 value=$(git config submodule."$name"."$option")
183 if test -z "$value"
184 then
185 value=$(git config -f .gitmodules submodule."$name"."$option")
186 fi
187 printf '%s' "${value:-$default}"
188}
189
862ae6cd
RS
190isnumber()
191{
192 n=$(($1 + 0)) 2>/dev/null && test "$n" = "$1"
193}
194
ecda0723
SV
195#
196# Add a new submodule to the working tree, .gitmodules and the index
197#
ec05df35 198# $@ = repo path
ecda0723
SV
199#
200# optional branch is stored in global branch variable
201#
23a485e3 202cmd_add()
ecda0723 203{
5c08dbbd 204 # parse $args after "submodule ... add".
091a6eb0 205 reference_path=
5c08dbbd
JH
206 while test $# -ne 0
207 do
208 case "$1" in
209 -b | --branch)
210 case "$2" in '') usage ;; esac
211 branch=$2
212 shift
213 ;;
d27b876b
JL
214 -f | --force)
215 force=$1
216 ;;
5c08dbbd 217 -q|--quiet)
2e6a30ef 218 GIT_QUIET=1
5c08dbbd 219 ;;
d92a3959
MT
220 --reference)
221 case "$2" in '') usage ;; esac
091a6eb0 222 reference_path=$2
d92a3959
MT
223 shift
224 ;;
225 --reference=*)
091a6eb0 226 reference_path="${1#--reference=}"
d92a3959 227 ;;
73b0898d
JL
228 --name)
229 case "$2" in '') usage ;; esac
230 custom_name=$2
231 shift
232 ;;
275cd184
FG
233 --depth)
234 case "$2" in '') usage ;; esac
235 depth="--depth=$2"
236 shift
237 ;;
238 --depth=*)
239 depth=$1
240 ;;
5c08dbbd
JH
241 --)
242 shift
243 break
244 ;;
245 -*)
246 usage
247 ;;
248 *)
249 break
250 ;;
251 esac
252 shift
253 done
254
091a6eb0
JK
255 if test -n "$reference_path"
256 then
257 is_absolute_path "$reference_path" ||
258 reference_path="$wt_prefix$reference_path"
259
260 reference="--reference=$reference_path"
261 fi
262
ecda0723 263 repo=$1
64394e3a 264 sm_path=$2
ecda0723 265
64394e3a 266 if test -z "$sm_path"; then
6a066230 267 sm_path=$(printf '%s\n' "$repo" |
1414e578
JL
268 sed -e 's|/$||' -e 's|:*/*\.git$||' -e 's|.*[/:]||g')
269 fi
270
496eeeb1 271 if test -z "$repo" || test -z "$sm_path"; then
ecda0723
SV
272 usage
273 fi
274
091a6eb0
JK
275 is_absolute_path "$sm_path" || sm_path="$wt_prefix$sm_path"
276
ec05df35
ML
277 # assure repo is absolute or relative to parent
278 case "$repo" in
279 ./*|../*)
091a6eb0
JK
280 test -z "$wt_prefix" ||
281 die "$(gettext "Relative path can only be used from the toplevel of the working tree")"
282
ec05df35
ML
283 # dereference source url relative to parent's url
284 realrepo=$(resolve_relative_url "$repo") || exit
285 ;;
286 *:*|/*)
287 # absolute url
288 realrepo=$repo
289 ;;
290 *)
497ee872 291 die "$(eval_gettext "repo URL: '\$repo' must be absolute or begin with ./|../")"
ec05df35
ML
292 ;;
293 esac
294
db75ada5
MG
295 # normalize path:
296 # multiple //; leading ./; /./; /../; trailing /
64394e3a 297 sm_path=$(printf '%s/\n' "$sm_path" |
db75ada5
MG
298 sed -e '
299 s|//*|/|g
300 s|^\(\./\)*||
8196e728 301 s|/\(\./\)*|/|g
db75ada5
MG
302 :start
303 s|\([^/]*\)/\.\./||
304 tstart
305 s|/*$||
306 ')
64394e3a
RJ
307 git ls-files --error-unmatch "$sm_path" > /dev/null 2>&1 &&
308 die "$(eval_gettext "'\$sm_path' already exists in the index")"
ecda0723 309
64394e3a 310 if test -z "$force" && ! git add --dry-run --ignore-missing "$sm_path" > /dev/null 2>&1
d27b876b 311 then
6ff875c5 312 eval_gettextln "The following path is ignored by one of your .gitignore files:
64394e3a 313\$sm_path
6ff875c5 314Use -f if you really want to add it." >&2
d27b876b
JL
315 exit 1
316 fi
317
73b0898d
JL
318 if test -n "$custom_name"
319 then
320 sm_name="$custom_name"
321 else
322 sm_name="$sm_path"
323 fi
324
d4264ca3 325 # perhaps the path exists and is already a git repo, else clone it
64394e3a 326 if test -e "$sm_path"
d4264ca3 327 then
496eeeb1 328 if test -d "$sm_path"/.git || test -f "$sm_path"/.git
d4264ca3 329 then
64394e3a 330 eval_gettextln "Adding existing repo at '\$sm_path' to the index"
d4264ca3 331 else
64394e3a 332 die "$(eval_gettext "'\$sm_path' already exists and is not a valid git repo")"
d4264ca3 333 fi
c2f93917 334
d4264ca3 335 else
4b7c286e
JL
336 if test -d ".git/modules/$sm_name"
337 then
338 if test -z "$force"
339 then
340 echo >&2 "$(eval_gettext "A git directory for '\$sm_name' is found locally with remote(s):")"
341 GIT_DIR=".git/modules/$sm_name" GIT_WORK_TREE=. git remote -v | grep '(fetch)' | sed -e s,^," ", -e s,' (fetch)',, >&2
342 echo >&2 "$(eval_gettext "If you want to reuse this local git directory instead of cloning again from")"
343 echo >&2 " $realrepo"
344 echo >&2 "$(eval_gettext "use the '--force' option. If the local git directory is not the correct repo")"
345 die "$(eval_gettext "or you are unsure what this means choose another name with the '--name' option.")"
346 else
347 echo "$(eval_gettext "Reactivating local git directory for submodule '\$sm_name'.")"
348 fi
349 fi
ee8838d1 350 git submodule--helper clone ${GIT_QUIET:+--quiet} --prefix "$wt_prefix" --path "$sm_path" --name "$sm_name" --url "$realrepo" "$reference" "$depth" || exit
d851ffb9
JH
351 (
352 clear_local_git_env
353 cd "$sm_path" &&
354 # ash fails to wordsplit ${branch:+-b "$branch"...}
355 case "$branch" in
356 '') git checkout -f -q ;;
357 ?*) git checkout -f -q -B "$branch" "origin/$branch" ;;
358 esac
359 ) || die "$(eval_gettext "Unable to checkout submodule '\$sm_path'")"
d4264ca3 360 fi
73b0898d 361 git config submodule."$sm_name".url "$realrepo"
d4264ca3 362
64394e3a
RJ
363 git add $force "$sm_path" ||
364 die "$(eval_gettext "Failed to add submodule '\$sm_path'")"
ecda0723 365
73b0898d
JL
366 git config -f .gitmodules submodule."$sm_name".path "$sm_path" &&
367 git config -f .gitmodules submodule."$sm_name".url "$repo" &&
b9289227
TK
368 if test -n "$branch"
369 then
370 git config -f .gitmodules submodule."$sm_name".branch "$branch"
371 fi &&
31991b02 372 git add --force .gitmodules ||
64394e3a 373 die "$(eval_gettext "Failed to register submodule '\$sm_path'")"
ecda0723
SV
374}
375
19a31f9c
ML
376#
377# Execute an arbitrary command sequence in each checked out
378# submodule
379#
380# $@ = command to execute
381#
382cmd_foreach()
383{
1d5bec8b
JH
384 # parse $args after "submodule ... foreach".
385 while test $# -ne 0
386 do
387 case "$1" in
388 -q|--quiet)
389 GIT_QUIET=1
390 ;;
15fc56a8
JH
391 --recursive)
392 recursive=1
393 ;;
1d5bec8b
JH
394 -*)
395 usage
396 ;;
397 *)
398 break
399 ;;
400 esac
401 shift
402 done
403
f030c96d
ÆAB
404 toplevel=$(pwd)
405
4dca1aa6
BC
406 # dup stdin so that it can be restored when running the external
407 # command in the subshell (and a recursive call to this function)
408 exec 3<&0
409
74703a1e 410 git submodule--helper list --prefix "$wt_prefix"|
64394e3a 411 while read mode sha1 stage sm_path
19a31f9c 412 do
be9d0a3a 413 die_if_unmatched "$mode"
64394e3a 414 if test -e "$sm_path"/.git
19a31f9c 415 then
ea2fa104
SB
416 displaypath=$(relative_path "$prefix$sm_path")
417 say "$(eval_gettext "Entering '\$displaypath'")"
0ea306ef 418 name=$(git submodule--helper name "$sm_path")
15fc56a8 419 (
64394e3a 420 prefix="$prefix$sm_path/"
74ae1419 421 clear_local_git_env
64394e3a 422 cd "$sm_path" &&
091a6eb0
JK
423 sm_path=$(relative_path "$sm_path") &&
424 # we make $path available to scripts ...
425 path=$sm_path &&
1c4fb136
AK
426 if test $# -eq 1
427 then
428 eval "$1"
429 else
430 "$@"
431 fi &&
15fc56a8
JH
432 if test -n "$recursive"
433 then
434 cmd_foreach "--recursive" "$@"
435 fi
4dca1aa6 436 ) <&3 3<&- ||
ea2fa104 437 die "$(eval_gettext "Stopping at '\$displaypath'; script returned non-zero status.")"
19a31f9c
ML
438 fi
439 done
440}
441
70c7ac22 442#
211b7f19 443# Register submodules in .git/config
70c7ac22
LH
444#
445# $@ = requested paths (default to all)
446#
23a485e3 447cmd_init()
70c7ac22 448{
5c08dbbd
JH
449 # parse $args after "submodule ... init".
450 while test $# -ne 0
451 do
452 case "$1" in
453 -q|--quiet)
2e6a30ef 454 GIT_QUIET=1
5c08dbbd
JH
455 ;;
456 --)
457 shift
458 break
459 ;;
460 -*)
461 usage
462 ;;
463 *)
464 break
465 ;;
466 esac
467 shift
468 done
469
74703a1e 470 git submodule--helper list --prefix "$wt_prefix" "$@" |
64394e3a 471 while read mode sha1 stage sm_path
70c7ac22 472 do
be9d0a3a 473 die_if_unmatched "$mode"
0ea306ef 474 name=$(git submodule--helper name "$sm_path") || exit
c1c259e2 475
c1ab00fb 476 displaypath=$(relative_path "$prefix$sm_path")
091a6eb0 477
c1c259e2 478 # Copy url setting when it is not set yet
2cd9de3e
JL
479 if test -z "$(git config "submodule.$name.url")"
480 then
481 url=$(git config -f .gitmodules submodule."$name".url)
482 test -z "$url" &&
091a6eb0 483 die "$(eval_gettext "No url found for submodule path '\$displaypath' in .gitmodules")"
2cd9de3e
JL
484
485 # Possibly a url relative to parent
486 case "$url" in
487 ./*|../*)
488 url=$(resolve_relative_url "$url") || exit
489 ;;
490 esac
491 git config submodule."$name".url "$url" ||
091a6eb0 492 die "$(eval_gettext "Failed to register url for submodule path '\$displaypath'")"
c1c259e2 493
091a6eb0 494 say "$(eval_gettext "Submodule '\$name' (\$url) registered for path '\$displaypath'")"
2cd9de3e 495 fi
70c7ac22 496
2cd9de3e 497 # Copy "update" setting when it is not set yet
ac1fbbda
JH
498 if upd="$(git config -f .gitmodules submodule."$name".update)" &&
499 test -n "$upd" &&
500 test -z "$(git config submodule."$name".update)"
501 then
502 case "$upd" in
efa8fd7e 503 checkout | rebase | merge | none)
ac1fbbda
JH
504 ;; # known modes of updating
505 *)
506 echo >&2 "warning: unknown update mode '$upd' suggested for submodule '$name'"
507 upd=none
508 ;;
509 esac
510 git config submodule."$name".update "$upd" ||
511 die "$(eval_gettext "Failed to register update mode for submodule path '\$displaypath'")"
512 fi
70c7ac22
LH
513 done
514}
515
cf419828
JL
516#
517# Unregister submodules from .git/config and remove their work tree
518#
519# $@ = requested paths (use '.' to deinit all submodules)
520#
521cmd_deinit()
522{
523 # parse $args after "submodule ... deinit".
f6a52799 524 deinit_all=
cf419828
JL
525 while test $# -ne 0
526 do
527 case "$1" in
528 -f|--force)
529 force=$1
530 ;;
531 -q|--quiet)
532 GIT_QUIET=1
533 ;;
f6a52799
SB
534 --all)
535 deinit_all=t
536 ;;
cf419828
JL
537 --)
538 shift
539 break
540 ;;
541 -*)
542 usage
543 ;;
544 *)
545 break
546 ;;
547 esac
548 shift
549 done
550
f6a52799
SB
551 if test -n "$deinit_all" && test "$#" -ne 0
552 then
553 echo >&2 "$(eval_gettext "pathspec and --all are incompatible")"
554 usage
555 fi
556 if test $# = 0 && test -z "$deinit_all"
cf419828 557 then
f6a52799 558 die "$(eval_gettext "Use '--all' if you really want to deinitialize all submodules")"
cf419828
JL
559 fi
560
74703a1e 561 git submodule--helper list --prefix "$wt_prefix" "$@" |
cf419828
JL
562 while read mode sha1 stage sm_path
563 do
564 die_if_unmatched "$mode"
0ea306ef 565 name=$(git submodule--helper name "$sm_path") || exit
cf419828 566
091a6eb0
JK
567 displaypath=$(relative_path "$sm_path")
568
cf419828
JL
569 # Remove the submodule work tree (unless the user already did it)
570 if test -d "$sm_path"
571 then
572 # Protect submodules containing a .git directory
573 if test -d "$sm_path/.git"
574 then
091a6eb0 575 echo >&2 "$(eval_gettext "Submodule work tree '\$displaypath' contains a .git directory")"
cf419828
JL
576 die "$(eval_gettext "(use 'rm -rf' if you really want to remove it including all of its history)")"
577 fi
578
579 if test -z "$force"
580 then
7b294bf4 581 git rm -qn "$sm_path" ||
091a6eb0 582 die "$(eval_gettext "Submodule work tree '\$displaypath' contains local modifications; use '-f' to discard them")"
cf419828 583 fi
7b294bf4 584 rm -rf "$sm_path" &&
091a6eb0
JK
585 say "$(eval_gettext "Cleared directory '\$displaypath'")" ||
586 say "$(eval_gettext "Could not remove submodule work tree '\$displaypath'")"
cf419828
JL
587 fi
588
091a6eb0 589 mkdir "$sm_path" || say "$(eval_gettext "Could not create empty submodule directory '\$displaypath'")"
cf419828
JL
590
591 # Remove the .git/config entries (unless the user already did it)
592 if test -n "$(git config --get-regexp submodule."$name\.")"
593 then
594 # Remove the whole section so we have a clean state when
595 # the user later decides to init this submodule again
596 url=$(git config submodule."$name".url)
597 git config --remove-section submodule."$name" 2>/dev/null &&
091a6eb0 598 say "$(eval_gettext "Submodule '\$name' (\$url) unregistered for path '\$displaypath'")"
cf419828
JL
599 fi
600 done
601}
602
fb43e31f
SB
603is_tip_reachable () (
604 clear_local_git_env
605 cd "$1" &&
606 rev=$(git rev-list -n 1 "$2" --not --all 2>/dev/null) &&
607 test -z "$rev"
608)
609
610fetch_in_submodule () (
611 clear_local_git_env
612 cd "$1" &&
613 case "$2" in
614 '')
615 git fetch ;;
616 *)
617 git fetch $(get_default_remote) "$2" ;;
618 esac
619)
620
70c7ac22 621#
211b7f19 622# Update each submodule path to correct revision, using clone and checkout as needed
70c7ac22
LH
623#
624# $@ = requested paths (default to all)
625#
23a485e3 626cmd_update()
70c7ac22 627{
5c08dbbd
JH
628 # parse $args after "submodule ... update".
629 while test $# -ne 0
630 do
631 case "$1" in
632 -q|--quiet)
2e6a30ef 633 GIT_QUIET=1
5c08dbbd 634 ;;
be4d2c83 635 -i|--init)
d92a3959 636 init=1
be4d2c83 637 ;;
06b1abb5
TK
638 --remote)
639 remote=1
640 ;;
31ca3ac3 641 -N|--no-fetch)
31ca3ac3
FF
642 nofetch=1
643 ;;
9db31bdf
NMC
644 -f|--force)
645 force=$1
646 ;;
ca2cedba 647 -r|--rebase)
32948425 648 update="rebase"
ca2cedba 649 ;;
d92a3959
MT
650 --reference)
651 case "$2" in '') usage ;; esac
652 reference="--reference=$2"
98dbe63d 653 shift
d92a3959
MT
654 ;;
655 --reference=*)
656 reference="$1"
d92a3959 657 ;;
42b49178 658 -m|--merge)
42b49178
JH
659 update="merge"
660 ;;
b13fd5c1 661 --recursive)
b13fd5c1
JH
662 recursive=1
663 ;;
efc5fb6a
JH
664 --checkout)
665 update="checkout"
666 ;;
275cd184
FG
667 --depth)
668 case "$2" in '') usage ;; esac
669 depth="--depth=$2"
670 shift
671 ;;
672 --depth=*)
673 depth=$1
674 ;;
5c08dbbd
JH
675 --)
676 shift
677 break
678 ;;
679 -*)
680 usage
681 ;;
682 *)
683 break
684 ;;
685 esac
98dbe63d 686 shift
5c08dbbd
JH
687 done
688
d92a3959
MT
689 if test -n "$init"
690 then
691 cmd_init "--" "$@" || return
692 fi
693
1b4735d9 694 cloned_modules=
74703a1e 695 git submodule--helper list --prefix "$wt_prefix" "$@" | {
15ffb7cd 696 err=
64394e3a 697 while read mode sha1 stage sm_path
70c7ac22 698 do
be9d0a3a 699 die_if_unmatched "$mode"
313ee0d6
NMC
700 if test "$stage" = U
701 then
75bf5e60 702 echo >&2 "Skipping unmerged submodule $prefix$sm_path"
313ee0d6
NMC
703 continue
704 fi
0ea306ef 705 name=$(git submodule--helper name "$sm_path") || exit
5be60078 706 url=$(git config submodule."$name".url)
d851ffb9 707 branch=$(get_submodule_config "$name" branch master)
efc5fb6a
JH
708 if ! test -z "$update"
709 then
710 update_module=$update
711 else
712 update_module=$(git config submodule."$name".update)
a2aed08b
TK
713 if test -z "$update_module"
714 then
715 update_module="checkout"
716 fi
efc5fb6a
JH
717 fi
718
091a6eb0
JK
719 displaypath=$(relative_path "$prefix$sm_path")
720
d851ffb9
JH
721 if test "$update_module" = "none"
722 then
091a6eb0 723 echo "Skipping submodule '$displaypath'"
efc5fb6a 724 continue
d851ffb9 725 fi
efc5fb6a 726
211b7f19 727 if test -z "$url"
70c7ac22
LH
728 then
729 # Only mention uninitialized submodules when its
730 # path have been specified
731 test "$#" != "0" &&
091a6eb0 732 say "$(eval_gettext "Submodule path '\$displaypath' not initialized
1c2ef66f 733Maybe you want to use 'update --init'?")"
211b7f19
LH
734 continue
735 fi
736
496eeeb1 737 if ! test -d "$sm_path"/.git && ! test -f "$sm_path"/.git
211b7f19 738 then
ee8838d1 739 git submodule--helper clone ${GIT_QUIET:+--quiet} --prefix "$prefix" --path "$sm_path" --name "$name" --url "$url" "$reference" "$depth" || exit
1b4735d9 740 cloned_modules="$cloned_modules;$name"
bf2d8246
LH
741 subsha1=
742 else
64394e3a 743 subsha1=$(clear_local_git_env; cd "$sm_path" &&
5be60078 744 git rev-parse --verify HEAD) ||
091a6eb0 745 die "$(eval_gettext "Unable to find current revision in submodule path '\$displaypath'")"
70c7ac22 746 fi
211b7f19 747
06b1abb5
TK
748 if test -n "$remote"
749 then
750 if test -z "$nofetch"
751 then
752 # Fetch remote before determining tracking $sha1
753 (clear_local_git_env; cd "$sm_path" && git-fetch) ||
754 die "$(eval_gettext "Unable to fetch in submodule path '\$sm_path'")"
755 fi
756 remote_name=$(clear_local_git_env; cd "$sm_path" && get_default_remote)
757 sha1=$(clear_local_git_env; cd "$sm_path" &&
758 git rev-parse --verify "${remote_name}/${branch}") ||
759 die "$(eval_gettext "Unable to find current ${remote_name}/${branch} revision in submodule path '\$sm_path'")"
760 fi
761
496eeeb1 762 if test "$subsha1" != "$sha1" || test -n "$force"
70c7ac22 763 then
9db31bdf
NMC
764 subforce=$force
765 # If we don't already have a -f flag and the submodule has never been checked out
496eeeb1 766 if test -z "$subsha1" && test -z "$force"
b9b378a0 767 then
9db31bdf 768 subforce="-f"
b9b378a0 769 fi
31ca3ac3
FF
770
771 if test -z "$nofetch"
772 then
e5f522d6
JL
773 # Run fetch only if $sha1 isn't present or it
774 # is not reachable from a ref.
fb43e31f
SB
775 is_tip_reachable "$sm_path" "$sha1" ||
776 fetch_in_submodule "$sm_path" ||
091a6eb0 777 die "$(eval_gettext "Unable to fetch in submodule path '\$displaypath'")"
fb43e31f
SB
778
779 # Now we tried the usual fetch, but $sha1 may
780 # not be reachable from any of the refs
781 is_tip_reachable "$sm_path" "$sha1" ||
782 fetch_in_submodule "$sm_path" "$sha1" ||
783 die "$(eval_gettext "Fetched in submodule path '\$displaypath', but it did not contain $sha1. Direct fetching of that commit failed.")"
31ca3ac3
FF
784 fi
785
1b4735d9
SO
786 # Is this something we just cloned?
787 case ";$cloned_modules;" in
788 *";$name;"*)
789 # then there is no local change to integrate
d851ffb9 790 update_module=checkout ;;
1b4735d9
SO
791 esac
792
877449c1 793 must_die_on_failure=
32948425 794 case "$update_module" in
a2aed08b
TK
795 checkout)
796 command="git checkout $subforce -q"
797 die_msg="$(eval_gettext "Unable to checkout '\$sha1' in submodule path '\$displaypath'")"
798 say_msg="$(eval_gettext "Submodule path '\$displaypath': checked out '\$sha1'")"
799 ;;
32948425
JH
800 rebase)
801 command="git rebase"
091a6eb0
JK
802 die_msg="$(eval_gettext "Unable to rebase '\$sha1' in submodule path '\$displaypath'")"
803 say_msg="$(eval_gettext "Submodule path '\$displaypath': rebased into '\$sha1'")"
877449c1 804 must_die_on_failure=yes
32948425 805 ;;
42b49178
JH
806 merge)
807 command="git merge"
091a6eb0
JK
808 die_msg="$(eval_gettext "Unable to merge '\$sha1' in submodule path '\$displaypath'")"
809 say_msg="$(eval_gettext "Submodule path '\$displaypath': merged in '\$sha1'")"
877449c1 810 must_die_on_failure=yes
42b49178 811 ;;
6cb5728c
CP
812 !*)
813 command="${update_module#!}"
b08238ac
SB
814 die_msg="$(eval_gettext "Execution of '\$command \$sha1' failed in submodule path '\$displaypath'")"
815 say_msg="$(eval_gettext "Submodule path '\$displaypath': '\$command \$sha1'")"
6cb5728c
CP
816 must_die_on_failure=yes
817 ;;
32948425 818 *)
a2aed08b 819 die "$(eval_gettext "Invalid update mode '$update_module' for submodule '$name'")"
32948425 820 esac
70c7ac22 821
64394e3a 822 if (clear_local_git_env; cd "$sm_path" && $command "$sha1")
15ffb7cd 823 then
ff968f03 824 say "$say_msg"
877449c1
JH
825 elif test -n "$must_die_on_failure"
826 then
ff968f03 827 die_with_status 2 "$die_msg"
15ffb7cd 828 else
ff968f03 829 err="${err};$die_msg"
877449c1 830 continue
15ffb7cd 831 fi
70c7ac22 832 fi
b13fd5c1
JH
833
834 if test -n "$recursive"
835 then
75bf5e60
WE
836 (
837 prefix="$prefix$sm_path/"
838 clear_local_git_env
839 cd "$sm_path" &&
36141282 840 eval cmd_update
75bf5e60 841 )
15ffb7cd
FG
842 res=$?
843 if test $res -gt 0
844 then
091a6eb0 845 die_msg="$(eval_gettext "Failed to recurse into submodule path '\$displaypath'")"
15ffb7cd
FG
846 if test $res -eq 1
847 then
ff968f03 848 err="${err};$die_msg"
15ffb7cd
FG
849 continue
850 else
ff968f03 851 die_with_status $res "$die_msg"
15ffb7cd
FG
852 fi
853 fi
b13fd5c1 854 fi
70c7ac22 855 done
15ffb7cd
FG
856
857 if test -n "$err"
858 then
859 OIFS=$IFS
860 IFS=';'
861 for e in $err
862 do
863 if test -n "$e"
864 then
865 echo >&2 "$e"
866 fi
867 done
868 IFS=$OIFS
869 exit 1
870 fi
871 }
70c7ac22
LH
872}
873
bffe71f4
EM
874set_name_rev () {
875 revname=$( (
74ae1419 876 clear_local_git_env
bffe71f4 877 cd "$1" && {
5be60078
JH
878 git describe "$2" 2>/dev/null ||
879 git describe --tags "$2" 2>/dev/null ||
f669ac0b
ML
880 git describe --contains "$2" 2>/dev/null ||
881 git describe --all --always "$2"
bffe71f4
EM
882 }
883 ) )
884 test -z "$revname" || revname=" ($revname)"
885}
28f9af5d
PY
886#
887# Show commit summary for submodules in index or working tree
888#
889# If '--cached' is given, show summary between index and given commit,
890# or between working tree and given commit
891#
892# $@ = [commit (default 'HEAD'),] requested paths (default all)
893#
894cmd_summary() {
f2dc06a3 895 summary_limit=-1
d0f64dd4 896 for_status=
1c244f6e 897 diff_cmd=diff-index
f2dc06a3 898
28f9af5d
PY
899 # parse $args after "submodule ... summary".
900 while test $# -ne 0
901 do
902 case "$1" in
903 --cached)
904 cached="$1"
905 ;;
1c244f6e
JL
906 --files)
907 files="$1"
908 ;;
d0f64dd4
PY
909 --for-status)
910 for_status="$1"
911 ;;
f2dc06a3 912 -n|--summary-limit)
862ae6cd
RS
913 summary_limit="$2"
914 isnumber "$summary_limit" || usage
f2dc06a3
PY
915 shift
916 ;;
862ae6cd
RS
917 --summary-limit=*)
918 summary_limit="${1#--summary-limit=}"
919 isnumber "$summary_limit" || usage
920 ;;
28f9af5d
PY
921 --)
922 shift
923 break
924 ;;
925 -*)
926 usage
927 ;;
928 *)
929 break
930 ;;
931 esac
932 shift
933 done
bffe71f4 934
f2dc06a3
PY
935 test $summary_limit = 0 && return
936
3deea89c 937 if rev=$(git rev-parse -q --verify --default HEAD ${1+"$1"})
28f9af5d
PY
938 then
939 head=$rev
caa9c3ca 940 test $# = 0 || shift
496eeeb1 941 elif test -z "$1" || test "$1" = "HEAD"
3deea89c 942 then
14e940d7
JH
943 # before the first commit: compare with an empty tree
944 head=$(git hash-object -w -t tree --stdin </dev/null)
2ea6c2c9 945 test -z "$1" || shift
28f9af5d 946 else
3deea89c 947 head="HEAD"
28f9af5d
PY
948 fi
949
1c244f6e
JL
950 if [ -n "$files" ]
951 then
952 test -n "$cached" &&
465d6a00 953 die "$(gettext "The --cached option cannot be used with the --files option")"
1c244f6e
JL
954 diff_cmd=diff-files
955 head=
956 fi
957
28f9af5d 958 cd_to_toplevel
091a6eb0 959 eval "set $(git rev-parse --sq --prefix "$wt_prefix" -- "$@")"
28f9af5d 960 # Get modified modules cared by user
18076502 961 modules=$(git $diff_cmd $cached --ignore-submodules=dirty --raw $head -- "$@" |
e1622bfc 962 sane_egrep '^:([0-7]* )?160000' |
2be94509 963 while read mod_src mod_dst sha1_src sha1_dst status sm_path
28f9af5d
PY
964 do
965 # Always show modules deleted or type-changed (blob<->module)
496eeeb1
EP
966 if test "$status" = D || test "$status" = T
967 then
6a066230 968 printf '%s\n' "$sm_path"
496eeeb1
EP
969 continue
970 fi
927b26f8 971 # Respect the ignore setting for --for-status.
972 if test -n "$for_status"
973 then
0ea306ef 974 name=$(git submodule--helper name "$sm_path")
927b26f8 975 ignore_config=$(get_submodule_config "$name" ignore none)
496eeeb1 976 test $status != A && test $ignore_config = all && continue
927b26f8 977 fi
28f9af5d 978 # Also show added or modified modules which are checked out
2be94509 979 GIT_DIR="$sm_path/.git" git-rev-parse --git-dir >/dev/null 2>&1 &&
6a066230 980 printf '%s\n' "$sm_path"
28f9af5d
PY
981 done
982 )
1cb639e6 983
d0f64dd4
PY
984 test -z "$modules" && return
985
18076502 986 git $diff_cmd $cached --ignore-submodules=dirty --raw $head -- $modules |
e1622bfc 987 sane_egrep '^:([0-7]* )?160000' |
1cb639e6
PY
988 cut -c2- |
989 while read mod_src mod_dst sha1_src sha1_dst status name
990 do
991 if test -z "$cached" &&
992 test $sha1_dst = 0000000000000000000000000000000000000000
993 then
994 case "$mod_dst" in
995 160000)
996 sha1_dst=$(GIT_DIR="$name/.git" git rev-parse HEAD)
997 ;;
998 100644 | 100755 | 120000)
999 sha1_dst=$(git hash-object $name)
1000 ;;
1001 000000)
1002 ;; # removed
1003 *)
1004 # unexpected type
6ff875c5 1005 eval_gettextln "unexpected mode \$mod_dst" >&2
1cb639e6
PY
1006 continue ;;
1007 esac
1008 fi
1009 missing_src=
1010 missing_dst=
1011
1012 test $mod_src = 160000 &&
30353a40 1013 ! GIT_DIR="$name/.git" git-rev-parse -q --verify $sha1_src^0 >/dev/null &&
1cb639e6
PY
1014 missing_src=t
1015
1016 test $mod_dst = 160000 &&
30353a40 1017 ! GIT_DIR="$name/.git" git-rev-parse -q --verify $sha1_dst^0 >/dev/null &&
1cb639e6 1018 missing_dst=t
bffe71f4 1019
091a6eb0
JK
1020 display_name=$(relative_path "$name")
1021
1cb639e6
PY
1022 total_commits=
1023 case "$missing_src,$missing_dst" in
1024 t,)
091a6eb0 1025 errmsg="$(eval_gettext " Warn: \$display_name doesn't contain commit \$sha1_src")"
1cb639e6
PY
1026 ;;
1027 ,t)
091a6eb0 1028 errmsg="$(eval_gettext " Warn: \$display_name doesn't contain commit \$sha1_dst")"
1cb639e6
PY
1029 ;;
1030 t,t)
091a6eb0 1031 errmsg="$(eval_gettext " Warn: \$display_name doesn't contain commits \$sha1_src and \$sha1_dst")"
1cb639e6
PY
1032 ;;
1033 *)
1034 errmsg=
1035 total_commits=$(
496eeeb1 1036 if test $mod_src = 160000 && test $mod_dst = 160000
1cb639e6
PY
1037 then
1038 range="$sha1_src...$sha1_dst"
1039 elif test $mod_src = 160000
1040 then
1041 range=$sha1_src
1042 else
1043 range=$sha1_dst
1044 fi
1045 GIT_DIR="$name/.git" \
b0e621ad 1046 git rev-list --first-parent $range -- | wc -l
1cb639e6 1047 )
eed35595 1048 total_commits=" ($(($total_commits + 0)))"
1cb639e6
PY
1049 ;;
1050 esac
1051
1052 sha1_abbr_src=$(echo $sha1_src | cut -c1-7)
1053 sha1_abbr_dst=$(echo $sha1_dst | cut -c1-7)
1054 if test $status = T
1055 then
b3e73449
ÆAB
1056 blob="$(gettext "blob")"
1057 submodule="$(gettext "submodule")"
1cb639e6
PY
1058 if test $mod_dst = 160000
1059 then
091a6eb0 1060 echo "* $display_name $sha1_abbr_src($blob)->$sha1_abbr_dst($submodule)$total_commits:"
1cb639e6 1061 else
091a6eb0 1062 echo "* $display_name $sha1_abbr_src($submodule)->$sha1_abbr_dst($blob)$total_commits:"
1cb639e6
PY
1063 fi
1064 else
091a6eb0 1065 echo "* $display_name $sha1_abbr_src...$sha1_abbr_dst$total_commits:"
1cb639e6
PY
1066 fi
1067 if test -n "$errmsg"
1068 then
1069 # Don't give error msg for modification whose dst is not submodule
1070 # i.e. deleted or changed to blob
1071 test $mod_dst = 160000 && echo "$errmsg"
1072 else
496eeeb1 1073 if test $mod_src = 160000 && test $mod_dst = 160000
1cb639e6 1074 then
f2dc06a3
PY
1075 limit=
1076 test $summary_limit -gt 0 && limit="-$summary_limit"
1cb639e6 1077 GIT_DIR="$name/.git" \
f2dc06a3 1078 git log $limit --pretty='format: %m %s' \
1cb639e6
PY
1079 --first-parent $sha1_src...$sha1_dst
1080 elif test $mod_dst = 160000
1081 then
1082 GIT_DIR="$name/.git" \
1083 git log --pretty='format: > %s' -1 $sha1_dst
1084 else
1085 GIT_DIR="$name/.git" \
1086 git log --pretty='format: < %s' -1 $sha1_src
1087 fi
1088 echo
1089 fi
1090 echo
3ba7407b 1091 done
28f9af5d 1092}
70c7ac22 1093#
941987a5 1094# List all submodules, prefixed with:
70c7ac22
LH
1095# - submodule not initialized
1096# + different revision checked out
1097#
1098# If --cached was specified the revision in the index will be printed
1099# instead of the currently checked out revision.
1100#
1101# $@ = requested paths (default to all)
1102#
23a485e3 1103cmd_status()
70c7ac22 1104{
5c08dbbd
JH
1105 # parse $args after "submodule ... status".
1106 while test $# -ne 0
1107 do
1108 case "$1" in
1109 -q|--quiet)
2e6a30ef 1110 GIT_QUIET=1
5c08dbbd
JH
1111 ;;
1112 --cached)
1113 cached=1
1114 ;;
64b19ffe
JH
1115 --recursive)
1116 recursive=1
1117 ;;
5c08dbbd
JH
1118 --)
1119 shift
1120 break
1121 ;;
1122 -*)
1123 usage
1124 ;;
1125 *)
1126 break
1127 ;;
1128 esac
1129 shift
1130 done
1131
74703a1e 1132 git submodule--helper list --prefix "$wt_prefix" "$@" |
64394e3a 1133 while read mode sha1 stage sm_path
70c7ac22 1134 do
be9d0a3a 1135 die_if_unmatched "$mode"
0ea306ef 1136 name=$(git submodule--helper name "$sm_path") || exit
5be60078 1137 url=$(git config submodule."$name".url)
091a6eb0 1138 displaypath=$(relative_path "$prefix$sm_path")
313ee0d6
NMC
1139 if test "$stage" = U
1140 then
1141 say "U$sha1 $displaypath"
1142 continue
1143 fi
496eeeb1
EP
1144 if test -z "$url" ||
1145 {
1146 ! test -d "$sm_path"/.git &&
1147 ! test -f "$sm_path"/.git
1148 }
70c7ac22 1149 then
64b19ffe 1150 say "-$sha1 $displaypath"
70c7ac22
LH
1151 continue;
1152 fi
64394e3a 1153 if git diff-files --ignore-submodules=dirty --quiet -- "$sm_path"
70c7ac22 1154 then
b545cd15 1155 set_name_rev "$sm_path" "$sha1"
64b19ffe 1156 say " $sha1 $displaypath$revname"
70c7ac22
LH
1157 else
1158 if test -z "$cached"
1159 then
64394e3a 1160 sha1=$(clear_local_git_env; cd "$sm_path" && git rev-parse --verify HEAD)
70c7ac22 1161 fi
b545cd15 1162 set_name_rev "$sm_path" "$sha1"
64b19ffe
JH
1163 say "+$sha1 $displaypath$revname"
1164 fi
1165
1166 if test -n "$recursive"
1167 then
1168 (
1169 prefix="$displaypath/"
74ae1419 1170 clear_local_git_env
10450cf7 1171 wt_prefix=
64394e3a 1172 cd "$sm_path" &&
e15bec0e 1173 eval cmd_status
64b19ffe 1174 ) ||
64394e3a 1175 die "$(eval_gettext "Failed to recurse into submodule path '\$sm_path'")"
70c7ac22
LH
1176 fi
1177 done
1178}
2327f61e
DA
1179#
1180# Sync remote urls for submodules
1181# This makes the value for remote.$remote.url match the value
1182# specified in .gitmodules.
1183#
1184cmd_sync()
1185{
1186 while test $# -ne 0
1187 do
1188 case "$1" in
1189 -q|--quiet)
2e6a30ef 1190 GIT_QUIET=1
2327f61e
DA
1191 shift
1192 ;;
82f49f29
PH
1193 --recursive)
1194 recursive=1
1195 shift
1196 ;;
2327f61e
DA
1197 --)
1198 shift
1199 break
1200 ;;
1201 -*)
1202 usage
1203 ;;
1204 *)
1205 break
1206 ;;
1207 esac
1208 done
1209 cd_to_toplevel
74703a1e 1210 git submodule--helper list --prefix "$wt_prefix" "$@" |
64394e3a 1211 while read mode sha1 stage sm_path
2327f61e 1212 do
be9d0a3a 1213 die_if_unmatched "$mode"
0ea306ef 1214 name=$(git submodule--helper name "$sm_path")
2327f61e 1215 url=$(git config -f .gitmodules --get submodule."$name".url)
baede9f8
JH
1216
1217 # Possibly a url relative to parent
1218 case "$url" in
1219 ./*|../*)
967b2c66
JS
1220 # rewrite foo/bar as ../.. to find path from
1221 # submodule work tree to superproject work tree
6a066230 1222 up_path="$(printf '%s\n' "$sm_path" | sed "s/[^/][^/]*/../g")" &&
967b2c66
JS
1223 # guarantee a trailing /
1224 up_path=${up_path%/}/ &&
1225 # path from submodule work tree to submodule origin repo
1226 sub_origin_url=$(resolve_relative_url "$url" "$up_path") &&
1227 # path from superproject work tree to submodule origin repo
1228 super_config_url=$(resolve_relative_url "$url") || exit
1229 ;;
1230 *)
1231 sub_origin_url="$url"
1232 super_config_url="$url"
baede9f8
JH
1233 ;;
1234 esac
1235
ccee6086 1236 if git config "submodule.$name.url" >/dev/null 2>/dev/null
2327f61e 1237 then
091a6eb0
JK
1238 displaypath=$(relative_path "$prefix$sm_path")
1239 say "$(eval_gettext "Synchronizing submodule url for '\$displaypath'")"
967b2c66 1240 git config submodule."$name".url "$super_config_url"
ccee6086 1241
64394e3a 1242 if test -e "$sm_path"/.git
ccee6086
JH
1243 then
1244 (
1245 clear_local_git_env
64394e3a 1246 cd "$sm_path"
ccee6086 1247 remote=$(get_default_remote)
967b2c66 1248 git config remote."$remote".url "$sub_origin_url"
82f49f29
PH
1249
1250 if test -n "$recursive"
1251 then
1252 prefix="$prefix$sm_path/"
1253 eval cmd_sync
1254 fi
ccee6086
JH
1255 )
1256 fi
2327f61e
DA
1257 fi
1258 done
1259}
70c7ac22 1260
5c08dbbd
JH
1261# This loop parses the command line arguments to find the
1262# subcommand name to dispatch. Parsing of the subcommand specific
1263# options are primarily done by the subcommand implementations.
1264# Subcommand specific options such as --branch and --cached are
1265# parsed here as well, for backward compatibility.
1266
1267while test $# != 0 && test -z "$command"
70c7ac22
LH
1268do
1269 case "$1" in
cf419828 1270 add | foreach | init | deinit | update | status | summary | sync)
5c08dbbd 1271 command=$1
70c7ac22
LH
1272 ;;
1273 -q|--quiet)
2e6a30ef 1274 GIT_QUIET=1
70c7ac22 1275 ;;
ecda0723
SV
1276 -b|--branch)
1277 case "$2" in
1278 '')
1279 usage
1280 ;;
1281 esac
1282 branch="$2"; shift
1283 ;;
70c7ac22 1284 --cached)
28f9af5d 1285 cached="$1"
70c7ac22
LH
1286 ;;
1287 --)
1288 break
1289 ;;
1290 -*)
1291 usage
1292 ;;
1293 *)
1294 break
1295 ;;
1296 esac
1297 shift
1298done
1299
5c08dbbd 1300# No command word defaults to "status"
af9c9f97
RR
1301if test -z "$command"
1302then
1303 if test $# = 0
1304 then
1305 command=status
1306 else
1307 usage
1308 fi
1309fi
5c08dbbd
JH
1310
1311# "-b branch" is accepted only by "add"
1312if test -n "$branch" && test "$command" != add
1313then
ecda0723 1314 usage
5c08dbbd
JH
1315fi
1316
28f9af5d 1317# "--cached" is accepted only by "status" and "summary"
496eeeb1 1318if test -n "$cached" && test "$command" != status && test "$command" != summary
5c08dbbd 1319then
70c7ac22 1320 usage
5c08dbbd
JH
1321fi
1322
1323"cmd_$command" "$@"