git submodule status: Add --recursive to recurse into nested submodules
[git/mingw.git] / git-submodule.sh
blob446bbc0a1056b4b9de802eebb7fe911e9d4d11a3
1 #!/bin/sh
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] [--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] [--rebase] [--reference <repository>] [--merge] [--recursive] [--] [<path>...]
12 or: $dashless [--quiet] summary [--cached] [--summary-limit <n>] [commit] [--] [<path>...]
13 or: $dashless [--quiet] foreach [--recursive] <command>
14 or: $dashless [--quiet] sync [--] [<path>...]"
15 OPTIONS_SPEC=
16 . git-sh-setup
17 . git-parse-remote
18 require_work_tree
20 command=
21 branch=
22 reference=
23 cached=
24 nofetch=
25 update=
26 prefix=
28 # Resolve relative url by appending to parent's url
29 resolve_relative_url ()
31 remote=$(get_default_remote)
32 remoteurl=$(git config "remote.$remote.url") ||
33 die "remote ($remote) does not have a url defined in .git/config"
34 url="$1"
35 remoteurl=${remoteurl%/}
36 while test -n "$url"
38 case "$url" in
39 ../*)
40 url="${url#../}"
41 remoteurl="${remoteurl%/*}"
43 ./*)
44 url="${url#./}"
47 break;;
48 esac
49 done
50 echo "$remoteurl/${url%/}"
54 # Get submodule info for registered submodules
55 # $@ = path to limit submodule list
57 module_list()
59 git ls-files --error-unmatch --stage -- "$@" | grep '^160000 '
63 # Map submodule path to submodule name
65 # $1 = path
67 module_name()
69 # Do we have "submodule.<something>.path = $1" defined in .gitmodules file?
70 re=$(printf '%s\n' "$1" | sed -e 's/[].[^$\\*]/\\&/g')
71 name=$( git config -f .gitmodules --get-regexp '^submodule\..*\.path$' |
72 sed -n -e 's|^submodule\.\(.*\)\.path '"$re"'$|\1|p' )
73 test -z "$name" &&
74 die "No submodule mapping found in .gitmodules for path '$path'"
75 echo "$name"
79 # Clone a submodule
81 # Prior to calling, cmd_update checks that a possibly existing
82 # path is not a git repository.
83 # Likewise, cmd_add checks that path does not exist at all,
84 # since it is the location of a new submodule.
86 module_clone()
88 path=$1
89 url=$2
90 reference="$3"
92 # If there already is a directory at the submodule path,
93 # expect it to be empty (since that is the default checkout
94 # action) and try to remove it.
95 # Note: if $path is a symlink to a directory the test will
96 # succeed but the rmdir will fail. We might want to fix this.
97 if test -d "$path"
98 then
99 rmdir "$path" 2>/dev/null ||
100 die "Directory '$path' exist, but is neither empty nor a git repository"
103 test -e "$path" &&
104 die "A file already exist at path '$path'"
106 if test -n "$reference"
107 then
108 git-clone "$reference" -n "$url" "$path"
109 else
110 git-clone -n "$url" "$path"
111 fi ||
112 die "Clone of '$url' into submodule path '$path' failed"
116 # Add a new submodule to the working tree, .gitmodules and the index
118 # $@ = repo path
120 # optional branch is stored in global branch variable
122 cmd_add()
124 # parse $args after "submodule ... add".
125 while test $# -ne 0
127 case "$1" in
128 -b | --branch)
129 case "$2" in '') usage ;; esac
130 branch=$2
131 shift
133 -q|--quiet)
134 GIT_QUIET=1
136 --reference)
137 case "$2" in '') usage ;; esac
138 reference="--reference=$2"
139 shift
141 --reference=*)
142 reference="$1"
143 shift
146 shift
147 break
150 usage
153 break
155 esac
156 shift
157 done
159 repo=$1
160 path=$2
162 if test -z "$repo" -o -z "$path"; then
163 usage
166 # assure repo is absolute or relative to parent
167 case "$repo" in
168 ./*|../*)
169 # dereference source url relative to parent's url
170 realrepo=$(resolve_relative_url "$repo") || exit
172 *:*|/*)
173 # absolute url
174 realrepo=$repo
177 die "repo URL: '$repo' must be absolute or begin with ./|../"
179 esac
181 # normalize path:
182 # multiple //; leading ./; /./; /../; trailing /
183 path=$(printf '%s/\n' "$path" |
184 sed -e '
185 s|//*|/|g
186 s|^\(\./\)*||
187 s|/\./|/|g
188 :start
189 s|\([^/]*\)/\.\./||
190 tstart
191 s|/*$||
193 git ls-files --error-unmatch "$path" > /dev/null 2>&1 &&
194 die "'$path' already exists in the index"
196 # perhaps the path exists and is already a git repo, else clone it
197 if test -e "$path"
198 then
199 if test -d "$path"/.git -o -f "$path"/.git
200 then
201 echo "Adding existing repo at '$path' to the index"
202 else
203 die "'$path' already exists and is not a valid git repo"
206 case "$repo" in
207 ./*|../*)
208 url=$(resolve_relative_url "$repo") || exit
211 url="$repo"
213 esac
214 git config submodule."$path".url "$url"
215 else
217 module_clone "$path" "$realrepo" "$reference" || exit
219 unset GIT_DIR
220 cd "$path" &&
221 # ash fails to wordsplit ${branch:+-b "$branch"...}
222 case "$branch" in
223 '') git checkout -f -q ;;
224 ?*) git checkout -f -q -b "$branch" "origin/$branch" ;;
225 esac
226 ) || die "Unable to checkout submodule '$path'"
229 git add "$path" ||
230 die "Failed to add submodule '$path'"
232 git config -f .gitmodules submodule."$path".path "$path" &&
233 git config -f .gitmodules submodule."$path".url "$repo" &&
234 git add .gitmodules ||
235 die "Failed to register submodule '$path'"
239 # Execute an arbitrary command sequence in each checked out
240 # submodule
242 # $@ = command to execute
244 cmd_foreach()
246 # parse $args after "submodule ... foreach".
247 while test $# -ne 0
249 case "$1" in
250 -q|--quiet)
251 GIT_QUIET=1
253 --recursive)
254 recursive=1
257 usage
260 break
262 esac
263 shift
264 done
266 module_list |
267 while read mode sha1 stage path
269 if test -e "$path"/.git
270 then
271 say "Entering '$prefix$path'"
272 name=$(module_name "$path")
274 prefix="$prefix$path/"
275 unset GIT_DIR
276 cd "$path" &&
277 eval "$@" &&
278 if test -n "$recursive"
279 then
280 cmd_foreach "--recursive" "$@"
282 ) ||
283 die "Stopping at '$path'; script returned non-zero status."
285 done
289 # Register submodules in .git/config
291 # $@ = requested paths (default to all)
293 cmd_init()
295 # parse $args after "submodule ... init".
296 while test $# -ne 0
298 case "$1" in
299 -q|--quiet)
300 GIT_QUIET=1
303 shift
304 break
307 usage
310 break
312 esac
313 shift
314 done
316 module_list "$@" |
317 while read mode sha1 stage path
319 # Skip already registered paths
320 name=$(module_name "$path") || exit
321 url=$(git config submodule."$name".url)
322 test -z "$url" || continue
324 url=$(git config -f .gitmodules submodule."$name".url)
325 test -z "$url" &&
326 die "No url found for submodule path '$path' in .gitmodules"
328 # Possibly a url relative to parent
329 case "$url" in
330 ./*|../*)
331 url=$(resolve_relative_url "$url") || exit
333 esac
335 git config submodule."$name".url "$url" ||
336 die "Failed to register url for submodule path '$path'"
338 upd="$(git config -f .gitmodules submodule."$name".update)"
339 test -z "$upd" ||
340 git config submodule."$name".update "$upd" ||
341 die "Failed to register update mode for submodule path '$path'"
343 say "Submodule '$name' ($url) registered for path '$path'"
344 done
348 # Update each submodule path to correct revision, using clone and checkout as needed
350 # $@ = requested paths (default to all)
352 cmd_update()
354 # parse $args after "submodule ... update".
355 orig_args="$@"
356 while test $# -ne 0
358 case "$1" in
359 -q|--quiet)
360 shift
361 GIT_QUIET=1
363 -i|--init)
364 init=1
365 shift
367 -N|--no-fetch)
368 shift
369 nofetch=1
371 -r|--rebase)
372 shift
373 update="rebase"
375 --reference)
376 case "$2" in '') usage ;; esac
377 reference="--reference=$2"
378 shift 2
380 --reference=*)
381 reference="$1"
382 shift
384 -m|--merge)
385 shift
386 update="merge"
388 --recursive)
389 shift
390 recursive=1
393 shift
394 break
397 usage
400 break
402 esac
403 done
405 if test -n "$init"
406 then
407 cmd_init "--" "$@" || return
410 module_list "$@" |
411 while read mode sha1 stage path
413 name=$(module_name "$path") || exit
414 url=$(git config submodule."$name".url)
415 update_module=$(git config submodule."$name".update)
416 if test -z "$url"
417 then
418 # Only mention uninitialized submodules when its
419 # path have been specified
420 test "$#" != "0" &&
421 say "Submodule path '$path' not initialized" &&
422 say "Maybe you want to use 'update --init'?"
423 continue
426 if ! test -d "$path"/.git -o -f "$path"/.git
427 then
428 module_clone "$path" "$url" "$reference"|| exit
429 subsha1=
430 else
431 subsha1=$(unset GIT_DIR; cd "$path" &&
432 git rev-parse --verify HEAD) ||
433 die "Unable to find current revision in submodule path '$path'"
436 if ! test -z "$update"
437 then
438 update_module=$update
441 if test "$subsha1" != "$sha1"
442 then
443 force=
444 if test -z "$subsha1"
445 then
446 force="-f"
449 if test -z "$nofetch"
450 then
451 (unset GIT_DIR; cd "$path" &&
452 git-fetch) ||
453 die "Unable to fetch in submodule path '$path'"
456 case "$update_module" in
457 rebase)
458 command="git rebase"
459 action="rebase"
460 msg="rebased onto"
462 merge)
463 command="git merge"
464 action="merge"
465 msg="merged in"
468 command="git checkout $force -q"
469 action="checkout"
470 msg="checked out"
472 esac
474 (unset GIT_DIR; cd "$path" && $command "$sha1") ||
475 die "Unable to $action '$sha1' in submodule path '$path'"
476 say "Submodule path '$path': $msg '$sha1'"
479 if test -n "$recursive"
480 then
481 (unset GIT_DIR; cd "$path" && cmd_update $orig_args) ||
482 die "Failed to recurse into submodule path '$path'"
484 done
487 set_name_rev () {
488 revname=$( (
489 unset GIT_DIR
490 cd "$1" && {
491 git describe "$2" 2>/dev/null ||
492 git describe --tags "$2" 2>/dev/null ||
493 git describe --contains "$2" 2>/dev/null ||
494 git describe --all --always "$2"
497 test -z "$revname" || revname=" ($revname)"
500 # Show commit summary for submodules in index or working tree
502 # If '--cached' is given, show summary between index and given commit,
503 # or between working tree and given commit
505 # $@ = [commit (default 'HEAD'),] requested paths (default all)
507 cmd_summary() {
508 summary_limit=-1
509 for_status=
511 # parse $args after "submodule ... summary".
512 while test $# -ne 0
514 case "$1" in
515 --cached)
516 cached="$1"
518 --for-status)
519 for_status="$1"
521 -n|--summary-limit)
522 if summary_limit=$(($2 + 0)) 2>/dev/null && test "$summary_limit" = "$2"
523 then
525 else
526 usage
528 shift
531 shift
532 break
535 usage
538 break
540 esac
541 shift
542 done
544 test $summary_limit = 0 && return
546 if rev=$(git rev-parse -q --verify "$1^0")
547 then
548 head=$rev
549 shift
550 else
551 head=HEAD
554 cd_to_toplevel
555 # Get modified modules cared by user
556 modules=$(git diff-index $cached --raw $head -- "$@" |
557 egrep '^:([0-7]* )?160000' |
558 while read mod_src mod_dst sha1_src sha1_dst status name
560 # Always show modules deleted or type-changed (blob<->module)
561 test $status = D -o $status = T && echo "$name" && continue
562 # Also show added or modified modules which are checked out
563 GIT_DIR="$name/.git" git-rev-parse --git-dir >/dev/null 2>&1 &&
564 echo "$name"
565 done
568 test -z "$modules" && return
570 git diff-index $cached --raw $head -- $modules |
571 egrep '^:([0-7]* )?160000' |
572 cut -c2- |
573 while read mod_src mod_dst sha1_src sha1_dst status name
575 if test -z "$cached" &&
576 test $sha1_dst = 0000000000000000000000000000000000000000
577 then
578 case "$mod_dst" in
579 160000)
580 sha1_dst=$(GIT_DIR="$name/.git" git rev-parse HEAD)
582 100644 | 100755 | 120000)
583 sha1_dst=$(git hash-object $name)
585 000000)
586 ;; # removed
588 # unexpected type
589 echo >&2 "unexpected mode $mod_dst"
590 continue ;;
591 esac
593 missing_src=
594 missing_dst=
596 test $mod_src = 160000 &&
597 ! GIT_DIR="$name/.git" git-rev-parse -q --verify $sha1_src^0 >/dev/null &&
598 missing_src=t
600 test $mod_dst = 160000 &&
601 ! GIT_DIR="$name/.git" git-rev-parse -q --verify $sha1_dst^0 >/dev/null &&
602 missing_dst=t
604 total_commits=
605 case "$missing_src,$missing_dst" in
607 errmsg=" Warn: $name doesn't contain commit $sha1_src"
610 errmsg=" Warn: $name doesn't contain commit $sha1_dst"
612 t,t)
613 errmsg=" Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
616 errmsg=
617 total_commits=$(
618 if test $mod_src = 160000 -a $mod_dst = 160000
619 then
620 range="$sha1_src...$sha1_dst"
621 elif test $mod_src = 160000
622 then
623 range=$sha1_src
624 else
625 range=$sha1_dst
627 GIT_DIR="$name/.git" \
628 git log --pretty=oneline --first-parent $range | wc -l
630 total_commits=" ($(($total_commits + 0)))"
632 esac
634 sha1_abbr_src=$(echo $sha1_src | cut -c1-7)
635 sha1_abbr_dst=$(echo $sha1_dst | cut -c1-7)
636 if test $status = T
637 then
638 if test $mod_dst = 160000
639 then
640 echo "* $name $sha1_abbr_src(blob)->$sha1_abbr_dst(submodule)$total_commits:"
641 else
642 echo "* $name $sha1_abbr_src(submodule)->$sha1_abbr_dst(blob)$total_commits:"
644 else
645 echo "* $name $sha1_abbr_src...$sha1_abbr_dst$total_commits:"
647 if test -n "$errmsg"
648 then
649 # Don't give error msg for modification whose dst is not submodule
650 # i.e. deleted or changed to blob
651 test $mod_dst = 160000 && echo "$errmsg"
652 else
653 if test $mod_src = 160000 -a $mod_dst = 160000
654 then
655 limit=
656 test $summary_limit -gt 0 && limit="-$summary_limit"
657 GIT_DIR="$name/.git" \
658 git log $limit --pretty='format: %m %s' \
659 --first-parent $sha1_src...$sha1_dst
660 elif test $mod_dst = 160000
661 then
662 GIT_DIR="$name/.git" \
663 git log --pretty='format: > %s' -1 $sha1_dst
664 else
665 GIT_DIR="$name/.git" \
666 git log --pretty='format: < %s' -1 $sha1_src
668 echo
670 echo
671 done |
672 if test -n "$for_status"; then
673 echo "# Modified submodules:"
674 echo "#"
675 sed -e 's|^|# |' -e 's|^# $|#|'
676 else
681 # List all submodules, prefixed with:
682 # - submodule not initialized
683 # + different revision checked out
685 # If --cached was specified the revision in the index will be printed
686 # instead of the currently checked out revision.
688 # $@ = requested paths (default to all)
690 cmd_status()
692 # parse $args after "submodule ... status".
693 orig_args="$@"
694 while test $# -ne 0
696 case "$1" in
697 -q|--quiet)
698 GIT_QUIET=1
700 --cached)
701 cached=1
703 --recursive)
704 recursive=1
707 shift
708 break
711 usage
714 break
716 esac
717 shift
718 done
720 module_list "$@" |
721 while read mode sha1 stage path
723 name=$(module_name "$path") || exit
724 url=$(git config submodule."$name".url)
725 displaypath="$prefix$path"
726 if test -z "$url" || ! test -d "$path"/.git -o -f "$path"/.git
727 then
728 say "-$sha1 $displaypath"
729 continue;
731 set_name_rev "$path" "$sha1"
732 if git diff-files --quiet -- "$path"
733 then
734 say " $sha1 $displaypath$revname"
735 else
736 if test -z "$cached"
737 then
738 sha1=$(unset GIT_DIR; cd "$path" && git rev-parse --verify HEAD)
739 set_name_rev "$path" "$sha1"
741 say "+$sha1 $displaypath$revname"
744 if test -n "$recursive"
745 then
747 prefix="$displaypath/"
748 unset GIT_DIR
749 cd "$path" &&
750 cmd_status $orig_args
751 ) ||
752 die "Failed to recurse into submodule path '$path'"
754 done
757 # Sync remote urls for submodules
758 # This makes the value for remote.$remote.url match the value
759 # specified in .gitmodules.
761 cmd_sync()
763 while test $# -ne 0
765 case "$1" in
766 -q|--quiet)
767 GIT_QUIET=1
768 shift
771 shift
772 break
775 usage
778 break
780 esac
781 done
782 cd_to_toplevel
783 module_list "$@" |
784 while read mode sha1 stage path
786 name=$(module_name "$path")
787 url=$(git config -f .gitmodules --get submodule."$name".url)
789 # Possibly a url relative to parent
790 case "$url" in
791 ./*|../*)
792 url=$(resolve_relative_url "$url") || exit
794 esac
796 if test -e "$path"/.git
797 then
799 unset GIT_DIR
800 cd "$path"
801 remote=$(get_default_remote)
802 say "Synchronizing submodule url for '$name'"
803 git config remote."$remote".url "$url"
806 done
809 # This loop parses the command line arguments to find the
810 # subcommand name to dispatch. Parsing of the subcommand specific
811 # options are primarily done by the subcommand implementations.
812 # Subcommand specific options such as --branch and --cached are
813 # parsed here as well, for backward compatibility.
815 while test $# != 0 && test -z "$command"
817 case "$1" in
818 add | foreach | init | update | status | summary | sync)
819 command=$1
821 -q|--quiet)
822 GIT_QUIET=1
824 -b|--branch)
825 case "$2" in
827 usage
829 esac
830 branch="$2"; shift
832 --cached)
833 cached="$1"
836 break
839 usage
842 break
844 esac
845 shift
846 done
848 # No command word defaults to "status"
849 test -n "$command" || command=status
851 # "-b branch" is accepted only by "add"
852 if test -n "$branch" && test "$command" != add
853 then
854 usage
857 # "--cached" is accepted only by "status" and "summary"
858 if test -n "$cached" && test "$command" != status -a "$command" != summary
859 then
860 usage
863 "cmd_$command" "$@"