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 die
"$(eval_gettext "remote
(\
$remote) does not have a url defined
in .git
/config
")"
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
227 eval_gettext
"The following path is ignored by one of your .gitignore files:
229 Use -f if you really want to add it." &&
235 # perhaps the path exists and is already a git repo, else clone it
238 if test -d "$path"/.git
-o -f "$path"/.git
240 eval_gettext
"Adding existing repo at '\$path' to the index"; echo
242 die
"$(eval_gettext "'\$path' already exists and is not a valid git repo
")"
247 url
=$
(resolve_relative_url
"$repo") ||
exit
253 git config submodule.
"$path".url
"$url"
256 module_clone
"$path" "$realrepo" "$reference" ||
exit
260 # ash fails to wordsplit ${branch:+-b "$branch"...}
262 '') git checkout
-f -q ;;
263 ?
*) git checkout
-f -q -B "$branch" "origin/$branch" ;;
265 ) || die
"$(eval_gettext "Unable to checkout submodule
'\$path'")"
268 git add
$force "$path" ||
269 die
"$(eval_gettext "Failed to add submodule
'\$path'")"
271 git config
-f .gitmodules submodule.
"$path".path
"$path" &&
272 git config
-f .gitmodules submodule.
"$path".url
"$repo" &&
273 git add
--force .gitmodules ||
274 die
"$(eval_gettext "Failed to register submodule
'\$path'")"
278 # Execute an arbitrary command sequence in each checked out
281 # $@ = command to execute
285 # parse $args after "submodule ... foreach".
307 # dup stdin so that it can be restored when running the external
308 # command in the subshell (and a recursive call to this function)
312 while read mode sha1 stage path
314 if test -e "$path"/.git
316 say
"$(eval_gettext "Entering
'\$prefix\$path'")"
317 name
=$
(module_name
"$path")
319 prefix
="$prefix$path/"
323 if test -n "$recursive"
325 cmd_foreach
"--recursive" "$@"
328 die
"$(eval_gettext "Stopping
at '\$path'; script returned non-zero status.
")"
334 # Register submodules in .git/config
336 # $@ = requested paths (default to all)
340 # parse $args after "submodule ... init".
362 while read mode sha1 stage path
364 # Skip already registered paths
365 name
=$
(module_name
"$path") ||
exit
366 url
=$
(git config submodule.
"$name".url
)
367 test -z "$url" ||
continue
369 url
=$
(git config
-f .gitmodules submodule.
"$name".url
)
371 die
"$(eval_gettext "No url found
for submodule path
'\$path' in .gitmodules
")"
373 # Possibly a url relative to parent
376 url
=$
(resolve_relative_url
"$url") ||
exit
380 git config submodule.
"$name".url
"$url" ||
381 die
"$(eval_gettext "Failed to register url
for submodule path
'\$path'")"
383 upd
="$(git config -f .gitmodules submodule."$name".update)"
385 git config submodule.
"$name".update
"$upd" ||
386 die
"$(eval_gettext "Failed to register update mode
for submodule path
'\$path'")"
388 say
"$(eval_gettext "Submodule
'\$name' (\
$url) registered
for path
'\$path'")"
393 # Update each submodule path to correct revision, using clone and checkout as needed
395 # $@ = requested paths (default to all)
399 # parse $args after "submodule ... update".
420 case "$2" in '') usage
;; esac
421 reference
="--reference=$2"
422 orig_flags
="$orig_flags $(git rev-parse --sq-quote "$1")"
445 orig_flags
="$orig_flags $(git rev-parse --sq-quote "$1")"
451 cmd_init
"--" "$@" ||
return
457 while read mode sha1 stage path
461 echo >&2 "Skipping unmerged submodule $path"
464 name
=$
(module_name
"$path") ||
exit
465 url
=$
(git config submodule.
"$name".url
)
466 update_module
=$
(git config submodule.
"$name".update
)
469 # Only mention uninitialized submodules when its
470 # path have been specified
472 say
"$(eval_gettext "Submodule path
'\$path' not initialized
473 Maybe you want to use
'update --init'?
")"
477 if ! test -d "$path"/.git
-o -f "$path"/.git
479 module_clone
"$path" "$url" "$reference"||
exit
480 cloned_modules
="$cloned_modules;$name"
483 subsha1
=$
(clear_local_git_env
; cd "$path" &&
484 git rev-parse
--verify HEAD
) ||
485 die
"$(eval_gettext "Unable to
find current revision
in submodule path
'\$path'")"
488 if ! test -z "$update"
490 update_module
=$update
493 if test "$subsha1" != "$sha1"
496 # If we don't already have a -f flag and the submodule has never been checked out
497 if test -z "$subsha1" -a -z "$force"
502 if test -z "$nofetch"
504 # Run fetch only if $sha1 isn't present or it
505 # is not reachable from a ref.
506 (clear_local_git_env
; cd "$path" &&
507 ( (rev=$
(git rev-list
-n 1 $sha1 --not --all 2>/dev
/null
) &&
508 test -z "$rev") || git-fetch
)) ||
509 die
"$(eval_gettext "Unable to fetch
in submodule path
'\$path'")"
512 # Is this something we just cloned?
513 case ";$cloned_modules;" in
515 # then there is no local change to integrate
520 case "$update_module" in
523 die_msg
="$(eval_gettext "Unable to rebase
'\$sha1' in submodule path
'\$path'")"
524 say_msg
="$(eval_gettext "Submodule path
'\$path': rebased into
'\$sha1'")"
525 must_die_on_failure
=yes
529 die_msg
="$(eval_gettext "Unable to merge
'\$sha1' in submodule path
'\$path'")"
530 say_msg
="$(eval_gettext "Submodule path
'\$path': merged
in '\$sha1'")"
531 must_die_on_failure
=yes
534 command="git checkout $subforce -q"
535 die_msg
="$(eval_gettext "Unable to checkout
'\$sha1' in submodule path
'\$path'")"
536 say_msg
="$(eval_gettext "Submodule path
'\$path': checked out
'\$sha1'")"
540 if (clear_local_git_env
; cd "$path" && $command "$sha1")
543 elif test -n "$must_die_on_failure"
545 die_with_status
2 "$die_msg"
547 err
="${err};$die_msg"
552 if test -n "$recursive"
554 (clear_local_git_env
; cd "$path" && eval cmd_update
"$orig_flags")
558 die_msg
="$(eval_gettext "Failed to recurse into submodule path
'\$path'")"
561 err
="${err};$die_msg"
564 die_with_status
$res "$die_msg"
591 git describe
"$2" 2>/dev
/null ||
592 git describe
--tags "$2" 2>/dev
/null ||
593 git describe
--contains "$2" 2>/dev
/null ||
594 git describe
--all --always "$2"
597 test -z "$revname" || revname
=" ($revname)"
600 # Show commit summary for submodules in index or working tree
602 # If '--cached' is given, show summary between index and given commit,
603 # or between working tree and given commit
605 # $@ = [commit (default 'HEAD'),] requested paths (default all)
612 # parse $args after "submodule ... summary".
626 if summary_limit
=$
(($2 + 0)) 2>/dev
/null
&& test "$summary_limit" = "$2"
648 test $summary_limit = 0 && return
650 if rev=$
(git rev-parse
-q --verify --default HEAD
${1+"$1"})
654 elif test -z "$1" -o "$1" = "HEAD"
656 # before the first commit: compare with an empty tree
657 head=$
(git hash-object
-w -t tree
--stdin </dev
/null
)
658 test -z "$1" ||
shift
666 die
"$(gettext -- "--cached cannot be used with
--files")"
672 # Get modified modules cared by user
673 modules
=$
(git
$diff_cmd $cached --ignore-submodules=dirty
--raw $head -- "$@" |
674 sane_egrep
'^:([0-7]* )?160000' |
675 while read mod_src mod_dst sha1_src sha1_dst status name
677 # Always show modules deleted or type-changed (blob<->module)
678 test $status = D
-o $status = T
&& echo "$name" && continue
679 # Also show added or modified modules which are checked out
680 GIT_DIR
="$name/.git" git-rev-parse
--git-dir >/dev
/null
2>&1 &&
685 test -z "$modules" && return
687 git
$diff_cmd $cached --ignore-submodules=dirty
--raw $head -- $modules |
688 sane_egrep
'^:([0-7]* )?160000' |
690 while read mod_src mod_dst sha1_src sha1_dst status name
692 if test -z "$cached" &&
693 test $sha1_dst = 0000000000000000000000000000000000000000
697 sha1_dst
=$
(GIT_DIR
="$name/.git" git rev-parse HEAD
)
699 100644 |
100755 |
120000)
700 sha1_dst
=$
(git hash-object
$name)
707 eval_gettext
"unexpected mode \$mod_dst" &&
716 test $mod_src = 160000 &&
717 ! GIT_DIR
="$name/.git" git-rev-parse
-q --verify $sha1_src^
0 >/dev
/null
&&
720 test $mod_dst = 160000 &&
721 ! GIT_DIR
="$name/.git" git-rev-parse
-q --verify $sha1_dst^
0 >/dev
/null
&&
725 case "$missing_src,$missing_dst" in
727 errmsg
="$(eval_gettext " Warn
: \
$name doesn
't contain commit \$sha1_src")"
730 errmsg="$(eval_gettext " Warn: \$name doesn't contain commit \
$sha1_dst")"
733 errmsg
="$(eval_gettext " Warn
: \
$name doesn
't contain commits \$sha1_src and \$sha1_dst")"
738 if test $mod_src = 160000 -a $mod_dst = 160000
740 range="$sha1_src...$sha1_dst"
741 elif test $mod_src = 160000
747 GIT_DIR="$name/.git" \
748 git rev-list --first-parent $range -- | wc -l
750 total_commits=" ($(($total_commits + 0)))"
754 sha1_abbr_src=$(echo $sha1_src | cut -c1-7)
755 sha1_abbr_dst=$(echo $sha1_dst | cut -c1-7)
758 blob="$(gettext "blob")"
759 submodule="$(gettext "submodule")"
760 if test $mod_dst = 160000
762 echo "* $name $sha1_abbr_src($blob)->$sha1_abbr_dst($submodule)$total_commits:"
764 echo "* $name $sha1_abbr_src($submodule)->$sha1_abbr_dst($blob)$total_commits:"
767 echo "* $name $sha1_abbr_src...$sha1_abbr_dst$total_commits:"
771 # Don't give error msg
for modification whose dst is not submodule
772 # i.e. deleted or changed to blob
773 test $mod_dst = 160000 && echo "$errmsg"
775 if test $mod_src = 160000 -a $mod_dst = 160000
778 test $summary_limit -gt 0 && limit
="-$summary_limit"
779 GIT_DIR
="$name/.git" \
780 git log
$limit --pretty='format: %m %s' \
781 --first-parent $sha1_src...
$sha1_dst
782 elif test $mod_dst = 160000
784 GIT_DIR
="$name/.git" \
785 git log
--pretty='format: > %s' -1 $sha1_dst
787 GIT_DIR
="$name/.git" \
788 git log
--pretty='format: < %s' -1 $sha1_src
794 if test -n "$for_status"; then
795 if [ -n "$files" ]; then
796 gettext "# Submodules changed but not updated:"; echo
798 gettext "# Submodule changes to be committed:"; echo
801 sed -e 's|^|# |' -e 's|^# $|#|'
807 # List all submodules, prefixed with:
808 # - submodule not initialized
809 # + different revision checked out
811 # If --cached was specified the revision in the index will be printed
812 # instead of the currently checked out revision.
814 # $@ = requested paths (default to all)
818 # parse $args after "submodule ... status".
843 orig_flags
="$orig_flags $(git rev-parse --sq-quote "$1")"
848 while read mode sha1 stage path
850 name
=$
(module_name
"$path") ||
exit
851 url
=$
(git config submodule.
"$name".url
)
852 displaypath
="$prefix$path"
855 say
"U$sha1 $displaypath"
858 if test -z "$url" ||
! test -d "$path"/.git
-o -f "$path"/.git
860 say
"-$sha1 $displaypath"
863 set_name_rev
"$path" "$sha1"
864 if git diff-files
--ignore-submodules=dirty
--quiet -- "$path"
866 say
" $sha1 $displaypath$revname"
870 sha1
=$
(clear_local_git_env
; cd "$path" && git rev-parse
--verify HEAD
)
871 set_name_rev
"$path" "$sha1"
873 say
"+$sha1 $displaypath$revname"
876 if test -n "$recursive"
879 prefix
="$displaypath/"
882 eval cmd_status
"$orig_args"
884 die
"$(eval_gettext "Failed to recurse into submodule path
'\$path'")"
889 # Sync remote urls for submodules
890 # This makes the value for remote.$remote.url match the value
891 # specified in .gitmodules.
916 while read mode sha1 stage path
918 name
=$
(module_name
"$path")
919 url
=$
(git config
-f .gitmodules
--get submodule.
"$name".url
)
921 # Possibly a url relative to parent
924 url
=$
(resolve_relative_url
"$url") ||
exit
928 say
"$(eval_gettext "Synchronizing submodule url
for '\$name'")"
929 git config submodule.
"$name".url
"$url"
931 if test -e "$path"/.git
936 remote
=$
(get_default_remote
)
937 git config remote.
"$remote".url
"$url"
943 # This loop parses the command line arguments to find the
944 # subcommand name to dispatch. Parsing of the subcommand specific
945 # options are primarily done by the subcommand implementations.
946 # Subcommand specific options such as --branch and --cached are
947 # parsed here as well, for backward compatibility.
949 while test $# != 0 && test -z "$command"
952 add | foreach | init | update | status | summary | sync
)
982 # No command word defaults to "status"
983 test -n "$command" ||
command=status
985 # "-b branch" is accepted only by "add"
986 if test -n "$branch" && test "$command" != add
991 # "--cached" is accepted only by "status" and "summary"
992 if test -n "$cached" && test "$command" != status
-a "$command" != summary