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