3 # git-submodule.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] [--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] [--checkout|--merge|--rebase] [--reference <repository>] [--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>...]"
22 wt_prefix=$(git rev-parse --show-prefix)
25 # Restrict ourselves to a vanilla subset of protocols; the URLs
26 # we get are under control of a remote repository, and we do not
27 # want them kicking off arbitrary git-remote-* programs.
29 # If the user has already specified a set of allowed protocols,
30 # we assume they know what they're doing and use that instead.
31 : ${GIT_ALLOW_PROTOCOL=file:git:http:https:ssh}
32 export GIT_ALLOW_PROTOCOL
49 # Resolve a path to be relative to another path. This is intended for
50 # converting submodule paths when git-submodule is run in a subdirectory
51 # and only handles paths where the directory separator is '/'.
53 # The output is the first argument as a path relative to the second argument,
54 # which defaults to $wt_prefix if it is omitted.
57 local target curdir result
59 curdir=${2-$wt_prefix}
63 while test -n "$curdir"
67 target=${target#"$curdir"/}
73 if test "$curdir" = "${curdir%/*}"
86 if test "$1" = "#unmatched"
93 # Print a submodule configuration setting
99 # Checks in the usual git-config places first (for overrides),
100 # otherwise it falls back on .gitmodules. This allows you to
101 # distribute project-wide defaults in .gitmodules, while still
102 # customizing individual repositories if necessary. If the option is
103 # not in .gitmodules either, print a default value.
105 get_submodule_config () {
109 value=$(git config submodule."$name"."$option")
112 value=$(git config -f .gitmodules submodule."$name"."$option")
114 printf '%s' "${value:-$default}"
119 n=$(($1 + 0)) 2>/dev/null && test "$n" = "$1"
122 # Sanitize the local git environment for use within a submodule. We
123 # can't simply use clear_local_git_env since we want to preserve some
124 # of the settings from GIT_CONFIG_PARAMETERS.
125 sanitize_submodule_env()
127 sanitized_config=$(git submodule--helper sanitize-config)
129 GIT_CONFIG_PARAMETERS=$sanitized_config
133 # Add a new submodule to the working tree, .gitmodules and the index
137 # optional branch is stored in global branch variable
141 # parse $args after "submodule ... add".
147 case "$2" in '') usage ;; esac
158 case "$2" in '') usage ;; esac
163 reference_path="${1#--reference=}"
166 case "$2" in '') usage ;; esac
171 case "$2" in '') usage ;; esac
192 if test -n "$reference_path"
194 is_absolute_path "$reference_path" ||
195 reference_path="$wt_prefix$reference_path"
197 reference="--reference=$reference_path"
203 if test -z "$sm_path"; then
204 sm_path=$(printf '%s\n' "$repo" |
205 sed -e 's|/$||' -e 's|:*/*\.git$||' -e 's|.*[/:]||g')
208 if test -z "$repo" || test -z "$sm_path"; then
212 is_absolute_path "$sm_path" || sm_path="$wt_prefix$sm_path"
214 # assure repo is absolute or relative to parent
217 test -z "$wt_prefix" ||
218 die "$(gettext "Relative path can only be used from the toplevel of the working tree")"
220 # dereference source url relative to parent's url
221 realrepo=$(git submodule--helper resolve-relative-url "$repo") || exit
228 die "$(eval_gettext "repo URL: '\$repo' must be absolute or begin with ./|../")"
233 # multiple //; leading ./; /./; /../; trailing /
234 sm_path=$(printf '%s/\n' "$sm_path" |
244 git ls-files --error-unmatch "$sm_path" > /dev/null 2>&1 &&
245 die "$(eval_gettext "'\$sm_path' already exists in the index")"
247 if test -z "$force" && ! git add --dry-run --ignore-missing "$sm_path" > /dev/null 2>&1
249 eval_gettextln "The following path is ignored by one of your .gitignore files:
251 Use -f if you really want to add it." >&2
255 if test -n "$custom_name"
257 sm_name="$custom_name"
262 # perhaps the path exists and is already a git repo, else clone it
263 if test -e "$sm_path"
265 if test -d "$sm_path"/.git || test -f "$sm_path"/.git
267 eval_gettextln "Adding existing repo at '\$sm_path' to the index"
269 die "$(eval_gettext "'\$sm_path' already exists and is not a valid git repo")"
273 if test -d ".git/modules/$sm_name"
277 echo >&2 "$(eval_gettext "A git directory for '\$sm_name' is found locally with remote(s):")"
278 GIT_DIR=".git/modules/$sm_name" GIT_WORK_TREE=. git remote -v | grep '(fetch)' | sed -e s,^," ", -e s,' (fetch)',, >&2
279 echo >&2 "$(eval_gettext "If you want to reuse this local git directory instead of cloning again from")"
280 echo >&2 " $realrepo"
281 echo >&2 "$(eval_gettext "use the '--force' option. If the local git directory is not the correct repo")"
282 die "$(eval_gettext "or you are unsure what this means choose another name with the '--name' option.")"
284 echo "$(eval_gettext "Reactivating local git directory for submodule '\$sm_name'.")"
287 git submodule--helper clone ${GIT_QUIET:+--quiet} --prefix "$wt_prefix" --path "$sm_path" --name "$sm_name" --url "$realrepo" ${reference:+"$reference"} ${depth:+"$depth"} || exit
289 sanitize_submodule_env
291 # ash fails to wordsplit ${branch:+-b "$branch"...}
293 '') git checkout -f -q ;;
294 ?*) git checkout -f -q -B "$branch" "origin/$branch" ;;
296 ) || die "$(eval_gettext "Unable to checkout submodule '\$sm_path'")"
298 git config submodule."$sm_name".url "$realrepo"
300 git add $force "$sm_path" ||
301 die "$(eval_gettext "Failed to add submodule '\$sm_path'")"
303 git config -f .gitmodules submodule."$sm_name".path "$sm_path" &&
304 git config -f .gitmodules submodule."$sm_name".url "$repo" &&
307 git config -f .gitmodules submodule."$sm_name".branch "$branch"
309 git add --force .gitmodules ||
310 die "$(eval_gettext "Failed to register submodule '\$sm_path'")"
314 # Execute an arbitrary command sequence in each checked out
317 # $@ = command to execute
321 # parse $args after "submodule ... foreach".
343 # dup stdin so that it can be restored when running the external
344 # command in the subshell (and a recursive call to this function)
347 git submodule--helper list --prefix "$wt_prefix"|
348 while read mode sha1 stage sm_path
350 die_if_unmatched "$mode"
351 if test -e "$sm_path"/.git
353 displaypath=$(relative_path "$prefix$sm_path")
354 say "$(eval_gettext "Entering '\$displaypath'")"
355 name=$(git submodule--helper name "$sm_path")
357 prefix="$prefix$sm_path/"
358 sanitize_submodule_env
360 sm_path=$(relative_path "$sm_path") &&
361 # we make $path available to scripts ...
369 if test -n "$recursive"
371 cmd_foreach "--recursive" "$@"
374 die "$(eval_gettext "Stopping at '\$displaypath'; script returned non-zero status.")"
380 # Register submodules in .git/config
382 # $@ = requested paths (default to all)
386 # parse $args after "submodule ... init".
407 git ${wt_prefix:+-C "$wt_prefix"} submodule--helper init ${GIT_QUIET:+--quiet} ${prefix:+--prefix "$prefix"} "$@"
411 # Unregister submodules from .git/config and remove their work tree
413 # $@ = requested paths (use '.' to deinit all submodules)
417 # parse $args after "submodule ... deinit".
443 die "$(eval_gettext "Use '.' if you really want to deinitialize all submodules")"
446 git submodule--helper list --prefix "$wt_prefix" "$@" |
447 while read mode sha1 stage sm_path
449 die_if_unmatched "$mode"
450 name=$(git submodule--helper name "$sm_path") || exit
452 displaypath=$(relative_path "$sm_path")
454 # Remove the submodule work tree (unless the user already did it)
455 if test -d "$sm_path"
457 # Protect submodules containing a .git directory
458 if test -d "$sm_path/.git"
460 echo >&2 "$(eval_gettext "Submodule work tree '\$displaypath' contains a .git directory")"
461 die "$(eval_gettext "(use 'rm -rf' if you really want to remove it including all of its history)")"
466 git rm -qn "$sm_path" ||
467 die "$(eval_gettext "Submodule work tree '\$displaypath' contains local modifications; use '-f' to discard them")"
470 say "$(eval_gettext "Cleared directory '\$displaypath'")" ||
471 say "$(eval_gettext "Could not remove submodule work tree '\$displaypath'")"
474 mkdir "$sm_path" || say "$(eval_gettext "Could not create empty submodule directory '\$displaypath'")"
476 # Remove the .git/config entries (unless the user already did it)
477 if test -n "$(git config --get-regexp submodule."$name\.")"
479 # Remove the whole section so we have a clean state when
480 # the user later decides to init this submodule again
481 url=$(git config submodule."$name".url)
482 git config --remove-section submodule."$name" 2>/dev/null &&
483 say "$(eval_gettext "Submodule '\$name' (\$url) unregistered for path '\$displaypath'")"
488 is_tip_reachable () (
489 sanitize_submodule_env &&
491 rev=$(git rev-list -n 1 "$2" --not --all 2>/dev/null) &&
495 fetch_in_submodule () (
496 sanitize_submodule_env &&
502 git fetch $(get_default_remote) "$2" ;;
507 # Update each submodule path to correct revision, using clone and checkout as needed
509 # $@ = requested paths (default to all)
513 # parse $args after "submodule ... update".
536 case "$2" in '') usage ;; esac
537 reference="--reference=$2"
553 case "$2" in '') usage ;; esac
561 case "$2" in '') usage ;; esac
584 cmd_init "--" "$@" || return
588 git submodule--helper update-clone ${GIT_QUIET:+--quiet} \
589 ${wt_prefix:+--prefix "$wt_prefix"} \
590 ${prefix:+--recursive-prefix "$prefix"} \
591 ${update:+--update "$update"} \
592 ${reference:+--reference "$reference"} \
593 ${depth:+--depth "$depth"} \
595 "$@" || echo "#unmatched"
598 while read mode sha1 stage just_cloned sm_path
600 die_if_unmatched "$mode"
602 name=$(git submodule--helper name "$sm_path") || exit
603 url=$(git config submodule."$name".url)
604 branch=$(get_submodule_config "$name" branch master)
605 if ! test -z "$update"
607 update_module=$update
609 update_module=$(git config submodule."$name".update)
610 if test -z "$update_module"
612 update_module="checkout"
616 displaypath=$(relative_path "$prefix$sm_path")
618 if test $just_cloned -eq 1
621 update_module=checkout
623 subsha1=$(sanitize_submodule_env; cd "$sm_path" &&
624 git rev-parse --verify HEAD) ||
625 die "$(eval_gettext "Unable to find current revision in submodule path '\$displaypath'")"
630 if test -z "$nofetch"
632 # Fetch remote before determining tracking $sha1
633 (sanitize_submodule_env; cd "$sm_path" && git-fetch) ||
634 die "$(eval_gettext "Unable to fetch in submodule path '\$sm_path'")"
636 remote_name=$(sanitize_submodule_env; cd "$sm_path" && get_default_remote)
637 sha1=$(sanitize_submodule_env; cd "$sm_path" &&
638 git rev-parse --verify "${remote_name}/${branch}") ||
639 die "$(eval_gettext "Unable to find current ${remote_name}/${branch} revision in submodule path '\$sm_path'")"
642 if test "$subsha1" != "$sha1" || test -n "$force"
645 # If we don't already have a -f flag and the submodule has never been checked out
646 if test -z "$subsha1" && test -z "$force"
651 if test -z "$nofetch"
653 # Run fetch only if $sha1 isn't present or it
654 # is not reachable from a ref.
655 is_tip_reachable "$sm_path" "$sha1" ||
656 fetch_in_submodule "$sm_path" ||
657 die "$(eval_gettext "Unable to fetch in submodule path '\$displaypath'")"
659 # Now we tried the usual fetch, but $sha1 may
660 # not be reachable from any of the refs
661 is_tip_reachable "$sm_path" "$sha1" ||
662 fetch_in_submodule "$sm_path" "$sha1" ||
663 die "$(eval_gettext "Fetched in submodule path '\$displaypath', but it did not contain $sha1. Direct fetching of that commit failed.")"
667 case "$update_module" in
669 command="git checkout $subforce -q"
670 die_msg="$(eval_gettext "Unable to checkout '\$sha1' in submodule path '\$displaypath'")"
671 say_msg="$(eval_gettext "Submodule path '\$displaypath': checked out '\$sha1'")"
675 die_msg="$(eval_gettext "Unable to rebase '\$sha1' in submodule path '\$displaypath'")"
676 say_msg="$(eval_gettext "Submodule path '\$displaypath': rebased into '\$sha1'")"
677 must_die_on_failure=yes
681 die_msg="$(eval_gettext "Unable to merge '\$sha1' in submodule path '\$displaypath'")"
682 say_msg="$(eval_gettext "Submodule path '\$displaypath': merged in '\$sha1'")"
683 must_die_on_failure=yes
686 command="${update_module#!}"
687 die_msg="$(eval_gettext "Execution of '\$command \$sha1' failed in submodule path '\$displaypath'")"
688 say_msg="$(eval_gettext "Submodule path '\$displaypath': '\$command \$sha1'")"
689 must_die_on_failure=yes
692 die "$(eval_gettext "Invalid update mode '$update_module' for submodule '$name'")"
695 if (sanitize_submodule_env; cd "$sm_path" && $command "$sha1")
698 elif test -n "$must_die_on_failure"
700 die_with_status 2 "$die_msg"
702 err="${err};$die_msg"
707 if test -n "$recursive"
710 prefix=$(relative_path "$prefix$sm_path/")
712 sanitize_submodule_env
719 die_msg="$(eval_gettext "Failed to recurse into submodule path '\$displaypath'")"
722 err="${err};$die_msg"
725 die_with_status $res "$die_msg"
750 sanitize_submodule_env
752 git describe "$2" 2>/dev/null ||
753 git describe --tags "$2" 2>/dev/null ||
754 git describe --contains "$2" 2>/dev/null ||
755 git describe --all --always "$2"
758 test -z "$revname" || revname=" ($revname)"
761 # Show commit summary for submodules in index or working tree
763 # If '--cached' is given, show summary between index and given commit,
764 # or between working tree and given commit
766 # $@ = [commit (default 'HEAD'),] requested paths (default all)
773 # parse $args after "submodule ... summary".
788 isnumber "$summary_limit" || usage
792 summary_limit="${1#--summary-limit=}"
793 isnumber "$summary_limit" || usage
809 test $summary_limit = 0 && return
811 if rev=$(git rev-parse -q --verify --default HEAD ${1+"$1"})
815 elif test -z "$1" || test "$1" = "HEAD"
817 # before the first commit: compare with an empty tree
818 head=$(git hash-object -w -t tree --stdin </dev/null)
819 test -z "$1" || shift
827 die "$(gettext "The --cached option cannot be used with the --files option")"
833 eval "set $(git rev-parse --sq --prefix "$wt_prefix" -- "$@")"
834 # Get modified modules cared by user
835 modules=$(git $diff_cmd $cached --ignore-submodules=dirty --raw $head -- "$@" |
836 sane_egrep '^:([0-7]* )?160000' |
837 while read mod_src mod_dst sha1_src sha1_dst status sm_path
839 # Always show modules deleted or type-changed (blob<->module)
840 if test "$status" = D || test "$status" = T
842 printf '%s\n' "$sm_path"
845 # Respect the ignore setting for --for-status.
846 if test -n "$for_status"
848 name=$(git submodule--helper name "$sm_path")
849 ignore_config=$(get_submodule_config "$name" ignore none)
850 test $status != A && test $ignore_config = all && continue
852 # Also show added or modified modules which are checked out
853 GIT_DIR="$sm_path/.git" git-rev-parse --git-dir >/dev/null 2>&1 &&
854 printf '%s\n' "$sm_path"
858 test -z "$modules" && return
860 git $diff_cmd $cached --ignore-submodules=dirty --raw $head -- $modules |
861 sane_egrep '^:([0-7]* )?160000' |
863 while read mod_src mod_dst sha1_src sha1_dst status name
865 if test -z "$cached" &&
866 test $sha1_dst = 0000000000000000000000000000000000000000
870 sha1_dst=$(GIT_DIR="$name/.git" git rev-parse HEAD)
872 100644 | 100755 | 120000)
873 sha1_dst=$(git hash-object $name)
879 eval_gettextln "unexpected mode \$mod_dst" >&2
886 test $mod_src = 160000 &&
887 ! GIT_DIR="$name/.git" git-rev-parse -q --verify $sha1_src^0 >/dev/null &&
890 test $mod_dst = 160000 &&
891 ! GIT_DIR="$name/.git" git-rev-parse -q --verify $sha1_dst^0 >/dev/null &&
894 display_name=$(relative_path "$name")
897 case "$missing_src,$missing_dst" in
899 errmsg="$(eval_gettext " Warn: \$display_name doesn't contain commit \$sha1_src")"
902 errmsg="$(eval_gettext " Warn: \$display_name doesn't contain commit \$sha1_dst")"
905 errmsg="$(eval_gettext " Warn: \$display_name doesn't contain commits \$sha1_src and \$sha1_dst")"
910 if test $mod_src = 160000 && test $mod_dst = 160000
912 range="$sha1_src...$sha1_dst"
913 elif test $mod_src = 160000
919 GIT_DIR="$name/.git" \
920 git rev-list --first-parent $range -- | wc -l
922 total_commits=" ($(($total_commits + 0)))"
926 sha1_abbr_src=$(echo $sha1_src | cut -c1-7)
927 sha1_abbr_dst=$(echo $sha1_dst | cut -c1-7)
930 blob="$(gettext "blob")"
931 submodule="$(gettext "submodule")"
932 if test $mod_dst = 160000
934 echo "* $display_name $sha1_abbr_src($blob)->$sha1_abbr_dst($submodule)$total_commits:"
936 echo "* $display_name $sha1_abbr_src($submodule)->$sha1_abbr_dst($blob)$total_commits:"
939 echo "* $display_name $sha1_abbr_src...$sha1_abbr_dst$total_commits:"
943 # Don't give error msg for modification whose dst is not submodule
944 # i.e. deleted or changed to blob
945 test $mod_dst = 160000 && echo "$errmsg"
947 if test $mod_src = 160000 && test $mod_dst = 160000
950 test $summary_limit -gt 0 && limit="-$summary_limit"
951 GIT_DIR="$name/.git" \
952 git log $limit --pretty='format: %m %s' \
953 --first-parent $sha1_src...$sha1_dst
954 elif test $mod_dst = 160000
956 GIT_DIR="$name/.git" \
957 git log --pretty='format: > %s' -1 $sha1_dst
959 GIT_DIR="$name/.git" \
960 git log --pretty='format: < %s' -1 $sha1_src
968 # List all submodules, prefixed with:
969 # - submodule not initialized
970 # + different revision checked out
972 # If --cached was specified the revision in the index will be printed
973 # instead of the currently checked out revision.
975 # $@ = requested paths (default to all)
979 # parse $args after "submodule ... status".
1006 git submodule--helper list --prefix "$wt_prefix" "$@" |
1007 while read mode sha1 stage sm_path
1009 die_if_unmatched "$mode"
1010 name=$(git submodule--helper name "$sm_path") || exit
1011 url=$(git config submodule."$name".url)
1012 displaypath=$(relative_path "$prefix$sm_path")
1013 if test "$stage" = U
1015 say "U$sha1 $displaypath"
1018 if test -z "$url" ||
1020 ! test -d "$sm_path"/.git &&
1021 ! test -f "$sm_path"/.git
1024 say "-$sha1 $displaypath"
1027 if git diff-files --ignore-submodules=dirty --quiet -- "$sm_path"
1029 set_name_rev "$sm_path" "$sha1"
1030 say " $sha1 $displaypath$revname"
1032 if test -z "$cached"
1034 sha1=$(sanitize_submodule_env; cd "$sm_path" && git rev-parse --verify HEAD)
1036 set_name_rev "$sm_path" "$sha1"
1037 say "+$sha1 $displaypath$revname"
1040 if test -n "$recursive"
1043 prefix="$displaypath/"
1044 sanitize_submodule_env
1049 die "$(eval_gettext "Failed to recurse into submodule path '\$sm_path'")"
1054 # Sync remote urls for submodules
1055 # This makes the value for remote.$remote.url match the value
1056 # specified in .gitmodules.
1084 git submodule--helper list --prefix "$wt_prefix" "$@" |
1085 while read mode sha1 stage sm_path
1087 die_if_unmatched "$mode"
1088 name=$(git submodule--helper name "$sm_path")
1089 url=$(git config -f .gitmodules --get submodule."$name".url)
1091 # Possibly a url relative to parent
1094 # rewrite foo/bar as ../.. to find path from
1095 # submodule work tree to superproject work tree
1096 up_path="$(printf '%s\n' "$sm_path" | sed "s/[^/][^/]*/../g")" &&
1097 # guarantee a trailing /
1098 up_path=${up_path%/}/ &&
1099 # path from submodule work tree to submodule origin repo
1100 sub_origin_url=$(git submodule--helper resolve-relative-url "$url" "$up_path") &&
1101 # path from superproject work tree to submodule origin repo
1102 super_config_url=$(git submodule--helper resolve-relative-url "$url") || exit
1105 sub_origin_url="$url"
1106 super_config_url="$url"
1110 if git config "submodule.$name.url" >/dev/null 2>/dev/null
1112 displaypath=$(relative_path "$prefix$sm_path")
1113 say "$(eval_gettext "Synchronizing submodule url for '\$displaypath'")"
1114 git config submodule."$name".url "$super_config_url"
1116 if test -e "$sm_path"/.git
1119 sanitize_submodule_env
1121 remote=$(get_default_remote)
1122 git config remote."$remote".url "$sub_origin_url"
1124 if test -n "$recursive"
1126 prefix="$prefix$sm_path/"
1135 # This loop parses the command line arguments to find the
1136 # subcommand name to dispatch. Parsing of the subcommand specific
1137 # options are primarily done by the subcommand implementations.
1138 # Subcommand specific options such as --branch and --cached are
1139 # parsed here as well, for backward compatibility.
1141 while test $# != 0 && test -z "$command"
1144 add | foreach | init | deinit | update | status | summary | sync)
1174 # No command word defaults to "status"
1175 if test -z "$command"
1185 # "-b branch" is accepted only by "add"
1186 if test -n "$branch" && test "$command" != add
1191 # "--cached" is accepted only by "status" and "summary"
1192 if test -n "$cached" && test "$command" != status && test "$command" != summary