3 # git-submodules.sh: add, init, update or list git submodules
5 # Copyright (c) 2007 Lars Hjemli
7 dashless=$(basename "$0" | sed -e 's/-/ /')
8 USAGE="[--quiet] add [-b branch] [-f|--force] [--reference <repository>] [--] <repository> [<path>]
9 or: $dashless [--quiet] status [--cached] [--recursive] [--] [<path>...]
10 or: $dashless [--quiet] init [--] [<path>...]
11 or: $dashless [--quiet] update [--init] [-N|--no-fetch] [-f|--force] [--rebase] [--reference <repository>] [--merge] [--recursive] [--] [<path>...]
12 or: $dashless [--quiet] summary [--cached|--files] [--summary-limit <n>] [commit] [--] [<path>...]
13 or: $dashless [--quiet] foreach [--recursive] <command>
14 or: $dashless [--quiet] sync [--] [<path>...]"
33 # Resolve relative url by appending to parent's url
34 resolve_relative_url ()
36 remote=$(get_default_remote)
37 remoteurl=$(git config "remote.$remote.url") ||
38 remoteurl=$(pwd) # the repository is its own authoritative upstream
40 remoteurl=${remoteurl%/}
49 remoteurl="${remoteurl%/*}"
52 remoteurl="${remoteurl%:*}"
56 die "$(eval_gettext "cannot strip one component off url '\$remoteurl'")"
67 echo "$remoteurl$sep${url%/}"
71 # Get submodule info for registered submodules
72 # $@ = path to limit submodule list
76 git ls-files --error-unmatch --stage -- "$@" |
79 my ($null_sha1) = ("0" x 40);
82 my ($mode, $sha1, $stage, $path) =
83 /^([0-7]+) ([0-9a-f]{40}) ([0-3])\t(.*)$/;
84 next unless $mode eq "160000";
86 if (!$unmerged{$path}++) {
87 print "$mode $null_sha1 U\t$path\n";
97 # Map submodule path to submodule name
103 # Do we have "submodule.<something>.path = $1" defined in .gitmodules file?
105 re=$(printf '%s\n' "$1" | sed -e 's/[].[^$\\*]/\\&/g')
106 name=$( git config -f .gitmodules --get-regexp '^submodule\..*\.path$' |
107 sed -n -e 's|^submodule\.\(.*\)\.path '"$re"'$|\1|p' )
109 die "$(eval_gettext "No submodule mapping found in .gitmodules for path '\$sm_path'")"
116 # Prior to calling, cmd_update checks that a possibly existing
117 # path is not a git repository.
118 # Likewise, cmd_add checks that path does not exist at all,
119 # since it is the location of a new submodule.
127 if test -n "$GIT_QUIET"
134 name=$(module_name "$sm_path" 2>/dev/null)
135 test -n "$name" || name="$sm_path"
136 base_name=$(dirname "$name")
138 gitdir=$(git rev-parse --git-dir)
139 gitdir_base="$gitdir/modules/$base_name"
140 gitdir="$gitdir/modules/$name"
145 rm -f "$gitdir/index"
147 mkdir -p "$gitdir_base"
148 git clone $quiet -n ${reference:+"$reference"} \
149 --separate-git-dir "$gitdir" "$url" "$sm_path" ||
150 die "$(eval_gettext "Clone of '\$url' into submodule path '\$sm_path' failed")"
153 a=$(cd "$gitdir" && pwd)/
154 b=$(cd "$sm_path" && pwd)/
155 # normalize Windows-style absolute paths to POSIX-style absolute paths
156 case $a in [a-zA-Z]:/*) a=/${a%%:*}${a#*:} ;; esac
157 case $b in [a-zA-Z]:/*) b=/${b%%:*}${b#*:} ;; esac
158 # Remove all common leading directories after a sanity check
159 if test "${a#$b}" != "$a" || test "${b#$a}" != "$b"; then
160 die "$(eval_gettext "Gitdir '\$a' is part of the submodule path '\$b' or vice versa")"
162 while test "${a%%/*}" = "${b%%/*}"
167 # Now chop off the trailing '/'s that were added in the beginning
171 # Turn each leading "*/" component into "../"
172 rel=$(echo $b | sed -e 's|[^/][^/]*|..|g')
173 echo "gitdir: $rel/$a" >"$sm_path/.git"
175 rel=$(echo $a | sed -e 's|[^/][^/]*|..|g')
176 (clear_local_git_env; cd "$sm_path" && GIT_WORK_TREE=. git config core.worktree "$rel/$b")
180 # Add a new submodule to the working tree, .gitmodules and the index
184 # optional branch is stored in global branch variable
188 # parse $args after "submodule ... add".
193 case "$2" in '') usage ;; esac
204 case "$2" in '') usage ;; esac
205 reference="--reference=$2"
229 if test -z "$sm_path"; then
230 sm_path=$(echo "$repo" |
231 sed -e 's|/$||' -e 's|:*/*\.git$||' -e 's|.*[/:]||g')
234 if test -z "$repo" -o -z "$sm_path"; then
238 # assure repo is absolute or relative to parent
241 # dereference source url relative to parent's url
242 realrepo=$(resolve_relative_url "$repo") || exit
249 die "$(eval_gettext "repo URL: '\$repo' must be absolute or begin with ./|../")"
254 # multiple //; leading ./; /./; /../; trailing /
255 sm_path=$(printf '%s/\n' "$sm_path" |
265 git ls-files --error-unmatch "$sm_path" > /dev/null 2>&1 &&
266 die "$(eval_gettext "'\$sm_path' already exists in the index")"
268 if test -z "$force" && ! git add --dry-run --ignore-missing "$sm_path" > /dev/null 2>&1
270 eval_gettextln "The following path is ignored by one of your .gitignore files:
272 Use -f if you really want to add it." >&2
276 # perhaps the path exists and is already a git repo, else clone it
277 if test -e "$sm_path"
279 if test -d "$sm_path"/.git -o -f "$sm_path"/.git
281 eval_gettextln "Adding existing repo at '\$sm_path' to the index"
283 die "$(eval_gettext "'\$sm_path' already exists and is not a valid git repo")"
288 module_clone "$sm_path" "$realrepo" "$reference" || exit
292 # ash fails to wordsplit ${branch:+-b "$branch"...}
294 '') git checkout -f -q ;;
295 ?*) git checkout -f -q -B "$branch" "origin/$branch" ;;
297 ) || die "$(eval_gettext "Unable to checkout submodule '\$sm_path'")"
299 git config submodule."$sm_path".url "$realrepo"
301 git add $force "$sm_path" ||
302 die "$(eval_gettext "Failed to add submodule '\$sm_path'")"
304 git config -f .gitmodules submodule."$sm_path".path "$sm_path" &&
305 git config -f .gitmodules submodule."$sm_path".url "$repo" &&
306 git add --force .gitmodules ||
307 die "$(eval_gettext "Failed to register submodule '\$sm_path'")"
311 # Execute an arbitrary command sequence in each checked out
314 # $@ = command to execute
318 # parse $args after "submodule ... foreach".
340 # dup stdin so that it can be restored when running the external
341 # command in the subshell (and a recursive call to this function)
345 while read mode sha1 stage sm_path
347 if test -e "$sm_path"/.git
349 say "$(eval_gettext "Entering '\$prefix\$sm_path'")"
350 name=$(module_name "$sm_path")
352 prefix="$prefix$sm_path/"
354 # we make $path available to scripts ...
358 if test -n "$recursive"
360 cmd_foreach "--recursive" "$@"
363 die "$(eval_gettext "Stopping at '\$sm_path'; script returned non-zero status.")"
369 # Register submodules in .git/config
371 # $@ = requested paths (default to all)
375 # parse $args after "submodule ... init".
397 while read mode sha1 stage sm_path
399 # Skip already registered paths
400 name=$(module_name "$sm_path") || exit
401 if test -z "$(git config "submodule.$name.url")"
403 url=$(git config -f .gitmodules submodule."$name".url)
405 die "$(eval_gettext "No url found for submodule path '\$sm_path' in .gitmodules")"
407 # Possibly a url relative to parent
410 url=$(resolve_relative_url "$url") || exit
413 git config submodule."$name".url "$url" ||
414 die "$(eval_gettext "Failed to register url for submodule path '\$sm_path'")"
417 # Copy "update" setting when it is not set yet
418 upd="$(git config -f .gitmodules submodule."$name".update)"
420 test -n "$(git config submodule."$name".update)" ||
421 git config submodule."$name".update "$upd" ||
422 die "$(eval_gettext "Failed to register update mode for submodule path '\$sm_path'")"
424 say "$(eval_gettext "Submodule '\$name' (\$url) registered for path '\$sm_path'")"
429 # Update each submodule path to correct revision, using clone and checkout as needed
431 # $@ = requested paths (default to all)
435 # parse $args after "submodule ... update".
456 case "$2" in '') usage ;; esac
457 reference="--reference=$2"
458 orig_flags="$orig_flags $(git rev-parse --sq-quote "$1")"
484 orig_flags="$orig_flags $(git rev-parse --sq-quote "$1")"
490 cmd_init "--" "$@" || return
496 while read mode sha1 stage sm_path
500 echo >&2 "Skipping unmerged submodule $sm_path"
503 name=$(module_name "$sm_path") || exit
504 url=$(git config submodule."$name".url)
505 if ! test -z "$update"
507 update_module=$update
509 update_module=$(git config submodule."$name".update)
512 if test "$update_module" = "none"
514 echo "Skipping submodule '$sm_path'"
520 # Only mention uninitialized submodules when its
521 # path have been specified
523 say "$(eval_gettext "Submodule path '\$sm_path' not initialized
524 Maybe you want to use 'update --init'?")"
528 if ! test -d "$sm_path"/.git -o -f "$sm_path"/.git
530 module_clone "$sm_path" "$url" "$reference"|| exit
531 cloned_modules="$cloned_modules;$name"
534 subsha1=$(clear_local_git_env; cd "$sm_path" &&
535 git rev-parse --verify HEAD) ||
536 die "$(eval_gettext "Unable to find current revision in submodule path '\$sm_path'")"
539 if test "$subsha1" != "$sha1"
542 # If we don't already have a -f flag and the submodule has never been checked out
543 if test -z "$subsha1" -a -z "$force"
548 if test -z "$nofetch"
550 # Run fetch only if $sha1 isn't present or it
551 # is not reachable from a ref.
552 (clear_local_git_env; cd "$sm_path" &&
553 ( (rev=$(git rev-list -n 1 $sha1 --not --all 2>/dev/null) &&
554 test -z "$rev") || git-fetch)) ||
555 die "$(eval_gettext "Unable to fetch in submodule path '\$sm_path'")"
558 # Is this something we just cloned?
559 case ";$cloned_modules;" in
561 # then there is no local change to integrate
566 case "$update_module" in
569 die_msg="$(eval_gettext "Unable to rebase '\$sha1' in submodule path '\$sm_path'")"
570 say_msg="$(eval_gettext "Submodule path '\$sm_path': rebased into '\$sha1'")"
571 must_die_on_failure=yes
575 die_msg="$(eval_gettext "Unable to merge '\$sha1' in submodule path '\$sm_path'")"
576 say_msg="$(eval_gettext "Submodule path '\$sm_path': merged in '\$sha1'")"
577 must_die_on_failure=yes
580 command="git checkout $subforce -q"
581 die_msg="$(eval_gettext "Unable to checkout '\$sha1' in submodule path '\$sm_path'")"
582 say_msg="$(eval_gettext "Submodule path '\$sm_path': checked out '\$sha1'")"
586 if (clear_local_git_env; cd "$sm_path" && $command "$sha1")
589 elif test -n "$must_die_on_failure"
591 die_with_status 2 "$die_msg"
593 err="${err};$die_msg"
598 if test -n "$recursive"
600 (clear_local_git_env; cd "$sm_path" && eval cmd_update "$orig_flags")
604 die_msg="$(eval_gettext "Failed to recurse into submodule path '\$sm_path'")"
607 err="${err};$die_msg"
610 die_with_status $res "$die_msg"
637 git describe "$2" 2>/dev/null ||
638 git describe --tags "$2" 2>/dev/null ||
639 git describe --contains "$2" 2>/dev/null ||
640 git describe --all --always "$2"
643 test -z "$revname" || revname=" ($revname)"
646 # Show commit summary for submodules in index or working tree
648 # If '--cached' is given, show summary between index and given commit,
649 # or between working tree and given commit
651 # $@ = [commit (default 'HEAD'),] requested paths (default all)
658 # parse $args after "submodule ... summary".
672 if summary_limit=$(($2 + 0)) 2>/dev/null && test "$summary_limit" = "$2"
694 test $summary_limit = 0 && return
696 if rev=$(git rev-parse -q --verify --default HEAD ${1+"$1"})
700 elif test -z "$1" -o "$1" = "HEAD"
702 # before the first commit: compare with an empty tree
703 head=$(git hash-object -w -t tree --stdin </dev/null)
704 test -z "$1" || shift
712 die "$(gettext -- "--cached cannot be used with --files")"
718 # Get modified modules cared by user
719 modules=$(git $diff_cmd $cached --ignore-submodules=dirty --raw $head -- "$@" |
720 sane_egrep '^:([0-7]* )?160000' |
721 while read mod_src mod_dst sha1_src sha1_dst status name
723 # Always show modules deleted or type-changed (blob<->module)
724 test $status = D -o $status = T && echo "$name" && continue
725 # Also show added or modified modules which are checked out
726 GIT_DIR="$name/.git" git-rev-parse --git-dir >/dev/null 2>&1 &&
731 test -z "$modules" && return
733 git $diff_cmd $cached --ignore-submodules=dirty --raw $head -- $modules |
734 sane_egrep '^:([0-7]* )?160000' |
736 while read mod_src mod_dst sha1_src sha1_dst status name
738 if test -z "$cached" &&
739 test $sha1_dst = 0000000000000000000000000000000000000000
743 sha1_dst=$(GIT_DIR="$name/.git" git rev-parse HEAD)
745 100644 | 100755 | 120000)
746 sha1_dst=$(git hash-object $name)
752 eval_gettextln "unexpected mode \$mod_dst" >&2
759 test $mod_src = 160000 &&
760 ! GIT_DIR="$name/.git" git-rev-parse -q --verify $sha1_src^0 >/dev/null &&
763 test $mod_dst = 160000 &&
764 ! GIT_DIR="$name/.git" git-rev-parse -q --verify $sha1_dst^0 >/dev/null &&
768 case "$missing_src,$missing_dst" in
770 errmsg="$(eval_gettext " Warn: \$name doesn't contain commit \$sha1_src")"
773 errmsg="$(eval_gettext " Warn: \$name doesn't contain commit \$sha1_dst")"
776 errmsg="$(eval_gettext " Warn: \$name doesn't contain commits \$sha1_src and \$sha1_dst")"
781 if test $mod_src = 160000 -a $mod_dst = 160000
783 range="$sha1_src...$sha1_dst"
784 elif test $mod_src = 160000
790 GIT_DIR="$name/.git" \
791 git rev-list --first-parent $range -- | wc -l
793 total_commits=" ($(($total_commits + 0)))"
797 sha1_abbr_src=$(echo $sha1_src | cut -c1-7)
798 sha1_abbr_dst=$(echo $sha1_dst | cut -c1-7)
801 blob="$(gettext "blob")"
802 submodule="$(gettext "submodule")"
803 if test $mod_dst = 160000
805 echo "* $name $sha1_abbr_src($blob)->$sha1_abbr_dst($submodule)$total_commits:"
807 echo "* $name $sha1_abbr_src($submodule)->$sha1_abbr_dst($blob)$total_commits:"
810 echo "* $name $sha1_abbr_src...$sha1_abbr_dst$total_commits:"
814 # Don't give error msg for modification whose dst is not submodule
815 # i.e. deleted or changed to blob
816 test $mod_dst = 160000 && echo "$errmsg"
818 if test $mod_src = 160000 -a $mod_dst = 160000
821 test $summary_limit -gt 0 && limit="-$summary_limit"
822 GIT_DIR="$name/.git" \
823 git log $limit --pretty='format: %m %s' \
824 --first-parent $sha1_src...$sha1_dst
825 elif test $mod_dst = 160000
827 GIT_DIR="$name/.git" \
828 git log --pretty='format: > %s' -1 $sha1_dst
830 GIT_DIR="$name/.git" \
831 git log --pretty='format: < %s' -1 $sha1_src
837 if test -n "$for_status"; then
838 if [ -n "$files" ]; then
839 gettextln "# Submodules changed but not updated:"
841 gettextln "# Submodule changes to be committed:"
844 sed -e 's|^|# |' -e 's|^# $|#|'
850 # List all submodules, prefixed with:
851 # - submodule not initialized
852 # + different revision checked out
854 # If --cached was specified the revision in the index will be printed
855 # instead of the currently checked out revision.
857 # $@ = requested paths (default to all)
861 # parse $args after "submodule ... status".
886 orig_flags="$orig_flags $(git rev-parse --sq-quote "$1")"
891 while read mode sha1 stage sm_path
893 name=$(module_name "$sm_path") || exit
894 url=$(git config submodule."$name".url)
895 displaypath="$prefix$sm_path"
898 say "U$sha1 $displaypath"
901 if test -z "$url" || ! test -d "$sm_path"/.git -o -f "$sm_path"/.git
903 say "-$sha1 $displaypath"
906 set_name_rev "$sm_path" "$sha1"
907 if git diff-files --ignore-submodules=dirty --quiet -- "$sm_path"
909 say " $sha1 $displaypath$revname"
913 sha1=$(clear_local_git_env; cd "$sm_path" && git rev-parse --verify HEAD)
914 set_name_rev "$sm_path" "$sha1"
916 say "+$sha1 $displaypath$revname"
919 if test -n "$recursive"
922 prefix="$displaypath/"
925 eval cmd_status "$orig_args"
927 die "$(eval_gettext "Failed to recurse into submodule path '\$sm_path'")"
932 # Sync remote urls for submodules
933 # This makes the value for remote.$remote.url match the value
934 # specified in .gitmodules.
959 while read mode sha1 stage sm_path
961 name=$(module_name "$sm_path")
962 url=$(git config -f .gitmodules --get submodule."$name".url)
964 # Possibly a url relative to parent
967 url=$(resolve_relative_url "$url") || exit
971 if git config "submodule.$name.url" >/dev/null 2>/dev/null
973 say "$(eval_gettext "Synchronizing submodule url for '\$name'")"
974 git config submodule."$name".url "$url"
976 if test -e "$sm_path"/.git
981 remote=$(get_default_remote)
982 git config remote."$remote".url "$url"
989 # This loop parses the command line arguments to find the
990 # subcommand name to dispatch. Parsing of the subcommand specific
991 # options are primarily done by the subcommand implementations.
992 # Subcommand specific options such as --branch and --cached are
993 # parsed here as well, for backward compatibility.
995 while test $# != 0 && test -z "$command"
998 add | foreach | init | update | status | summary | sync)
1028 # No command word defaults to "status"
1029 test -n "$command" || command=status
1031 # "-b branch" is accepted only by "add"
1032 if test -n "$branch" && test "$command" != add
1037 # "--cached" is accepted only by "status" and "summary"
1038 if test -n "$cached" && test "$command" != status -a "$command" != summary