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