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