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?
104 re=$(printf '%s\n' "$1" | sed -e 's/[].[^$\\*]/\\&/g')
105 name=$( git config -f .gitmodules --get-regexp '^submodule\..*\.path$' |
106 sed -n -e 's|^submodule\.\(.*\)\.path '"$re"'$|\1|p' )
108 die "$(eval_gettext "No submodule mapping found in .gitmodules for path '\$path'")"
115 # Prior to calling, cmd_update checks that a possibly existing
116 # path is not a git repository.
117 # Likewise, cmd_add checks that path does not exist at all,
118 # since it is the location of a new submodule.
126 if test -n "$reference"
128 git-clone "$reference" -n "$url" "$path"
130 git-clone -n "$url" "$path"
132 die "$(eval_gettext "Clone of '\$url' into submodule path '\$path' failed")"
136 # Add a new submodule to the working tree, .gitmodules and the index
140 # optional branch is stored in global branch variable
144 # parse $args after "submodule ... add".
149 case "$2" in '') usage ;; esac
160 case "$2" in '') usage ;; esac
161 reference="--reference=$2"
185 if test -z "$path"; then
186 path=$(echo "$repo" |
187 sed -e 's|/$||' -e 's|:*/*\.git$||' -e 's|.*[/:]||g')
190 if test -z "$repo" -o -z "$path"; then
194 # assure repo is absolute or relative to parent
197 # dereference source url relative to parent's url
198 realrepo=$(resolve_relative_url "$repo") || exit
205 die "$(eval_gettext "repo URL: '\$repo' must be absolute or begin with ./|../")"
210 # multiple //; leading ./; /./; /../; trailing /
211 path=$(printf '%s/\n' "$path" |
221 git ls-files --error-unmatch "$path" > /dev/null 2>&1 &&
222 die "$(eval_gettext "'\$path' already exists in the index")"
224 if test -z "$force" && ! git add --dry-run --ignore-missing "$path" > /dev/null 2>&1
226 eval_gettextln "The following path is ignored by one of your .gitignore files:
228 Use -f if you really want to add it." >&2
232 # perhaps the path exists and is already a git repo, else clone it
235 if test -d "$path"/.git -o -f "$path"/.git
237 eval_gettextln "Adding existing repo at '\$path' to the index"
239 die "$(eval_gettext "'\$path' already exists and is not a valid git repo")"
244 module_clone "$path" "$realrepo" "$reference" || exit
248 # ash fails to wordsplit ${branch:+-b "$branch"...}
250 '') git checkout -f -q ;;
251 ?*) git checkout -f -q -B "$branch" "origin/$branch" ;;
253 ) || die "$(eval_gettext "Unable to checkout submodule '\$path'")"
255 git config submodule."$path".url "$realrepo"
257 git add $force "$path" ||
258 die "$(eval_gettext "Failed to add submodule '\$path'")"
260 git config -f .gitmodules submodule."$path".path "$path" &&
261 git config -f .gitmodules submodule."$path".url "$repo" &&
262 git add --force .gitmodules ||
263 die "$(eval_gettext "Failed to register submodule '\$path'")"
267 # Execute an arbitrary command sequence in each checked out
270 # $@ = command to execute
274 # parse $args after "submodule ... foreach".
296 # dup stdin so that it can be restored when running the external
297 # command in the subshell (and a recursive call to this function)
301 while read mode sha1 stage path
303 if test -e "$path"/.git
305 say "$(eval_gettext "Entering '\$prefix\$path'")"
306 name=$(module_name "$path")
308 prefix="$prefix$path/"
312 if test -n "$recursive"
314 cmd_foreach "--recursive" "$@"
317 die "$(eval_gettext "Stopping at '\$path'; script returned non-zero status.")"
323 # Register submodules in .git/config
325 # $@ = requested paths (default to all)
329 # parse $args after "submodule ... init".
351 while read mode sha1 stage path
353 # Skip already registered paths
354 name=$(module_name "$path") || exit
355 if test -z "$(git config "submodule.$name.url")"
357 url=$(git config -f .gitmodules submodule."$name".url)
359 die "$(eval_gettext "No url found for submodule path '\$path' in .gitmodules")"
361 # Possibly a url relative to parent
364 url=$(resolve_relative_url "$url") || exit
367 git config submodule."$name".url "$url" ||
368 die "$(eval_gettext "Failed to register url for submodule path '\$path'")"
371 # Copy "update" setting when it is not set yet
372 upd="$(git config -f .gitmodules submodule."$name".update)"
374 test -n "$(git config submodule."$name".update)" ||
375 git config submodule."$name".update "$upd" ||
376 die "$(eval_gettext "Failed to register update mode for submodule path '\$path'")"
378 say "$(eval_gettext "Submodule '\$name' (\$url) registered for path '\$path'")"
383 # Update each submodule path to correct revision, using clone and checkout as needed
385 # $@ = requested paths (default to all)
389 # parse $args after "submodule ... update".
410 case "$2" in '') usage ;; esac
411 reference="--reference=$2"
412 orig_flags="$orig_flags $(git rev-parse --sq-quote "$1")"
435 orig_flags="$orig_flags $(git rev-parse --sq-quote "$1")"
441 cmd_init "--" "$@" || return
447 while read mode sha1 stage path
451 echo >&2 "Skipping unmerged submodule $path"
454 name=$(module_name "$path") || exit
455 url=$(git config submodule."$name".url)
456 update_module=$(git config submodule."$name".update)
459 # Only mention uninitialized submodules when its
460 # path have been specified
462 say "$(eval_gettext "Submodule path '\$path' not initialized
463 Maybe you want to use 'update --init'?")"
467 if ! test -d "$path"/.git -o -f "$path"/.git
469 module_clone "$path" "$url" "$reference"|| exit
470 cloned_modules="$cloned_modules;$name"
473 subsha1=$(clear_local_git_env; cd "$path" &&
474 git rev-parse --verify HEAD) ||
475 die "$(eval_gettext "Unable to find current revision in submodule path '\$path'")"
478 if ! test -z "$update"
480 update_module=$update
483 if test "$subsha1" != "$sha1"
486 # If we don't already have a -f flag and the submodule has never been checked out
487 if test -z "$subsha1" -a -z "$force"
492 if test -z "$nofetch"
494 # Run fetch only if $sha1 isn't present or it
495 # is not reachable from a ref.
496 (clear_local_git_env; cd "$path" &&
497 ( (rev=$(git rev-list -n 1 $sha1 --not --all 2>/dev/null) &&
498 test -z "$rev") || git-fetch)) ||
499 die "$(eval_gettext "Unable to fetch in submodule path '\$path'")"
502 # Is this something we just cloned?
503 case ";$cloned_modules;" in
505 # then there is no local change to integrate
510 case "$update_module" in
513 die_msg="$(eval_gettext "Unable to rebase '\$sha1' in submodule path '\$path'")"
514 say_msg="$(eval_gettext "Submodule path '\$path': rebased into '\$sha1'")"
515 must_die_on_failure=yes
519 die_msg="$(eval_gettext "Unable to merge '\$sha1' in submodule path '\$path'")"
520 say_msg="$(eval_gettext "Submodule path '\$path': merged in '\$sha1'")"
521 must_die_on_failure=yes
524 command="git checkout $subforce -q"
525 die_msg="$(eval_gettext "Unable to checkout '\$sha1' in submodule path '\$path'")"
526 say_msg="$(eval_gettext "Submodule path '\$path': checked out '\$sha1'")"
530 if (clear_local_git_env; cd "$path" && $command "$sha1")
533 elif test -n "$must_die_on_failure"
535 die_with_status 2 "$die_msg"
537 err="${err};$die_msg"
542 if test -n "$recursive"
544 (clear_local_git_env; cd "$path" && eval cmd_update "$orig_flags")
548 die_msg="$(eval_gettext "Failed to recurse into submodule path '\$path'")"
551 err="${err};$die_msg"
554 die_with_status $res "$die_msg"
581 git describe "$2" 2>/dev/null ||
582 git describe --tags "$2" 2>/dev/null ||
583 git describe --contains "$2" 2>/dev/null ||
584 git describe --all --always "$2"
587 test -z "$revname" || revname=" ($revname)"
590 # Show commit summary for submodules in index or working tree
592 # If '--cached' is given, show summary between index and given commit,
593 # or between working tree and given commit
595 # $@ = [commit (default 'HEAD'),] requested paths (default all)
602 # parse $args after "submodule ... summary".
616 if summary_limit=$(($2 + 0)) 2>/dev/null && test "$summary_limit" = "$2"
638 test $summary_limit = 0 && return
640 if rev=$(git rev-parse -q --verify --default HEAD ${1+"$1"})
644 elif test -z "$1" -o "$1" = "HEAD"
646 # before the first commit: compare with an empty tree
647 head=$(git hash-object -w -t tree --stdin </dev/null)
648 test -z "$1" || shift
656 die "$(gettext -- "--cached cannot be used with --files")"
662 # Get modified modules cared by user
663 modules=$(git $diff_cmd $cached --ignore-submodules=dirty --raw $head -- "$@" |
664 sane_egrep '^:([0-7]* )?160000' |
665 while read mod_src mod_dst sha1_src sha1_dst status name
667 # Always show modules deleted or type-changed (blob<->module)
668 test $status = D -o $status = T && echo "$name" && continue
669 # Also show added or modified modules which are checked out
670 GIT_DIR="$name/.git" git-rev-parse --git-dir >/dev/null 2>&1 &&
675 test -z "$modules" && return
677 git $diff_cmd $cached --ignore-submodules=dirty --raw $head -- $modules |
678 sane_egrep '^:([0-7]* )?160000' |
680 while read mod_src mod_dst sha1_src sha1_dst status name
682 if test -z "$cached" &&
683 test $sha1_dst = 0000000000000000000000000000000000000000
687 sha1_dst=$(GIT_DIR="$name/.git" git rev-parse HEAD)
689 100644 | 100755 | 120000)
690 sha1_dst=$(git hash-object $name)
696 eval_gettextln "unexpected mode \$mod_dst" >&2
703 test $mod_src = 160000 &&
704 ! GIT_DIR="$name/.git" git-rev-parse -q --verify $sha1_src^0 >/dev/null &&
707 test $mod_dst = 160000 &&
708 ! GIT_DIR="$name/.git" git-rev-parse -q --verify $sha1_dst^0 >/dev/null &&
712 case "$missing_src,$missing_dst" in
714 errmsg="$(eval_gettext " Warn: \$name doesn't contain commit \$sha1_src")"
717 errmsg="$(eval_gettext " Warn: \$name doesn't contain commit \$sha1_dst")"
720 errmsg="$(eval_gettext " Warn: \$name doesn't contain commits \$sha1_src and \$sha1_dst")"
725 if test $mod_src = 160000 -a $mod_dst = 160000
727 range="$sha1_src...$sha1_dst"
728 elif test $mod_src = 160000
734 GIT_DIR="$name/.git" \
735 git rev-list --first-parent $range -- | wc -l
737 total_commits=" ($(($total_commits + 0)))"
741 sha1_abbr_src=$(echo $sha1_src | cut -c1-7)
742 sha1_abbr_dst=$(echo $sha1_dst | cut -c1-7)
745 blob="$(gettext "blob")"
746 submodule="$(gettext "submodule")"
747 if test $mod_dst = 160000
749 echo "* $name $sha1_abbr_src($blob)->$sha1_abbr_dst($submodule)$total_commits:"
751 echo "* $name $sha1_abbr_src($submodule)->$sha1_abbr_dst($blob)$total_commits:"
754 echo "* $name $sha1_abbr_src...$sha1_abbr_dst$total_commits:"
758 # Don't give error msg for modification whose dst is not submodule
759 # i.e. deleted or changed to blob
760 test $mod_dst = 160000 && echo "$errmsg"
762 if test $mod_src = 160000 -a $mod_dst = 160000
765 test $summary_limit -gt 0 && limit="-$summary_limit"
766 GIT_DIR="$name/.git" \
767 git log $limit --pretty='format: %m %s' \
768 --first-parent $sha1_src...$sha1_dst
769 elif test $mod_dst = 160000
771 GIT_DIR="$name/.git" \
772 git log --pretty='format: > %s' -1 $sha1_dst
774 GIT_DIR="$name/.git" \
775 git log --pretty='format: < %s' -1 $sha1_src
781 if test -n "$for_status"; then
782 if [ -n "$files" ]; then
783 gettextln "# Submodules changed but not updated:"
785 gettextln "# Submodule changes to be committed:"
788 sed -e 's|^|# |' -e 's|^# $|#|'
794 # List all submodules, prefixed with:
795 # - submodule not initialized
796 # + different revision checked out
798 # If --cached was specified the revision in the index will be printed
799 # instead of the currently checked out revision.
801 # $@ = requested paths (default to all)
805 # parse $args after "submodule ... status".
830 orig_flags="$orig_flags $(git rev-parse --sq-quote "$1")"
835 while read mode sha1 stage path
837 name=$(module_name "$path") || exit
838 url=$(git config submodule."$name".url)
839 displaypath="$prefix$path"
842 say "U$sha1 $displaypath"
845 if test -z "$url" || ! test -d "$path"/.git -o -f "$path"/.git
847 say "-$sha1 $displaypath"
850 set_name_rev "$path" "$sha1"
851 if git diff-files --ignore-submodules=dirty --quiet -- "$path"
853 say " $sha1 $displaypath$revname"
857 sha1=$(clear_local_git_env; cd "$path" && git rev-parse --verify HEAD)
858 set_name_rev "$path" "$sha1"
860 say "+$sha1 $displaypath$revname"
863 if test -n "$recursive"
866 prefix="$displaypath/"
869 eval cmd_status "$orig_args"
871 die "$(eval_gettext "Failed to recurse into submodule path '\$path'")"
876 # Sync remote urls for submodules
877 # This makes the value for remote.$remote.url match the value
878 # specified in .gitmodules.
903 while read mode sha1 stage path
905 name=$(module_name "$path")
906 url=$(git config -f .gitmodules --get submodule."$name".url)
908 # Possibly a url relative to parent
911 url=$(resolve_relative_url "$url") || exit
915 if git config "submodule.$name.url" >/dev/null 2>/dev/null
917 say "$(eval_gettext "Synchronizing submodule url for '\$name'")"
918 git config submodule."$name".url "$url"
920 if test -e "$path"/.git
925 remote=$(get_default_remote)
926 git config remote."$remote".url "$url"
933 # This loop parses the command line arguments to find the
934 # subcommand name to dispatch. Parsing of the subcommand specific
935 # options are primarily done by the subcommand implementations.
936 # Subcommand specific options such as --branch and --cached are
937 # parsed here as well, for backward compatibility.
939 while test $# != 0 && test -z "$command"
942 add | foreach | init | update | status | summary | sync)
972 # No command word defaults to "status"
973 test -n "$command" || command=status
975 # "-b branch" is accepted only by "add"
976 if test -n "$branch" && test "$command" != add
981 # "--cached" is accepted only by "status" and "summary"
982 if test -n "$cached" && test "$command" != status -a "$command" != summary