pickaxe tests: refactor to use test_commit --append --printf
[git/debian.git] / git-submodule.sh
blobeb90f182296c0127b45ecd2aca20aff96e24bddb
1 #!/bin/sh
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] [--cached]
9 or: $dashless [--quiet] add [-b <branch>] [-f|--force] [--name <name>] [--reference <repository>] [--] <repository> [<path>]
10 or: $dashless [--quiet] status [--cached] [--recursive] [--] [<path>...]
11 or: $dashless [--quiet] init [--] [<path>...]
12 or: $dashless [--quiet] deinit [-f|--force] (--all| [--] <path>...)
13 or: $dashless [--quiet] update [--init] [--remote] [-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-shallow] [--reference <repository>] [--recursive] [--[no-]single-branch] [--] [<path>...]
14 or: $dashless [--quiet] set-branch (--default|--branch <branch>) [--] <path>
15 or: $dashless [--quiet] set-url [--] <path> <newurl>
16 or: $dashless [--quiet] summary [--cached|--files] [--summary-limit <n>] [commit] [--] [<path>...]
17 or: $dashless [--quiet] foreach [--recursive] <command>
18 or: $dashless [--quiet] sync [--recursive] [--] [<path>...]
19 or: $dashless [--quiet] absorbgitdirs [--] [<path>...]"
20 OPTIONS_SPEC=
21 SUBDIRECTORY_OK=Yes
22 . git-sh-setup
23 require_work_tree
24 wt_prefix=$(git rev-parse --show-prefix)
25 cd_to_toplevel
27 # Tell the rest of git that any URLs we get don't come
28 # directly from the user, so it can apply policy as appropriate.
29 GIT_PROTOCOL_FROM_USER=0
30 export GIT_PROTOCOL_FROM_USER
32 command=
33 branch=
34 force=
35 reference=
36 cached=
37 recursive=
38 init=
39 require_init=
40 files=
41 remote=
42 nofetch=
43 update=
44 prefix=
45 custom_name=
46 depth=
47 progress=
48 dissociate=
49 single_branch=
50 jobs=
51 recommend_shallow=
53 die_if_unmatched ()
55 if test "$1" = "#unmatched"
56 then
57 exit ${2:-1}
61 isnumber()
63 n=$(($1 + 0)) 2>/dev/null && test "$n" = "$1"
66 # Given a full hex object ID, is this the zero OID?
67 is_zero_oid () {
68 echo "$1" | sane_egrep '^0+$' >/dev/null 2>&1
71 # Sanitize the local git environment for use within a submodule. We
72 # can't simply use clear_local_git_env since we want to preserve some
73 # of the settings from GIT_CONFIG_PARAMETERS.
74 sanitize_submodule_env()
76 save_config=$GIT_CONFIG_PARAMETERS
77 clear_local_git_env
78 GIT_CONFIG_PARAMETERS=$save_config
79 export GIT_CONFIG_PARAMETERS
83 # Add a new submodule to the working tree, .gitmodules and the index
85 # $@ = repo path
87 # optional branch is stored in global branch variable
89 cmd_add()
91 # parse $args after "submodule ... add".
92 reference_path=
93 while test $# -ne 0
95 case "$1" in
96 -b | --branch)
97 case "$2" in '') usage ;; esac
98 branch=$2
99 shift
101 -f | --force)
102 force=$1
104 -q|--quiet)
105 GIT_QUIET=1
107 --progress)
108 progress=1
110 --reference)
111 case "$2" in '') usage ;; esac
112 reference_path=$2
113 shift
115 --reference=*)
116 reference_path="${1#--reference=}"
118 --dissociate)
119 dissociate=1
121 --name)
122 case "$2" in '') usage ;; esac
123 custom_name=$2
124 shift
126 --depth)
127 case "$2" in '') usage ;; esac
128 depth="--depth=$2"
129 shift
131 --depth=*)
132 depth=$1
135 shift
136 break
139 usage
142 break
144 esac
145 shift
146 done
148 if ! git submodule--helper config --check-writeable >/dev/null 2>&1
149 then
150 die "$(eval_gettext "please make sure that the .gitmodules file is in the working tree")"
153 if test -n "$reference_path"
154 then
155 is_absolute_path "$reference_path" ||
156 reference_path="$wt_prefix$reference_path"
158 reference="--reference=$reference_path"
161 repo=$1
162 sm_path=$2
164 if test -z "$sm_path"; then
165 sm_path=$(printf '%s\n' "$repo" |
166 sed -e 's|/$||' -e 's|:*/*\.git$||' -e 's|.*[/:]||g')
169 if test -z "$repo" || test -z "$sm_path"; then
170 usage
173 is_absolute_path "$sm_path" || sm_path="$wt_prefix$sm_path"
175 # assure repo is absolute or relative to parent
176 case "$repo" in
177 ./*|../*)
178 test -z "$wt_prefix" ||
179 die "$(gettext "Relative path can only be used from the toplevel of the working tree")"
181 # dereference source url relative to parent's url
182 realrepo=$(git submodule--helper resolve-relative-url "$repo") || exit
184 *:*|/*)
185 # absolute url
186 realrepo=$repo
189 die "$(eval_gettext "repo URL: '\$repo' must be absolute or begin with ./|../")"
191 esac
193 # normalize path:
194 # multiple //; leading ./; /./; /../; trailing /
195 sm_path=$(printf '%s/\n' "$sm_path" |
196 sed -e '
197 s|//*|/|g
198 s|^\(\./\)*||
199 s|/\(\./\)*|/|g
200 :start
201 s|\([^/]*\)/\.\./||
202 tstart
203 s|/*$||
205 if test -z "$force"
206 then
207 git ls-files --error-unmatch "$sm_path" > /dev/null 2>&1 &&
208 die "$(eval_gettext "'\$sm_path' already exists in the index")"
209 else
210 git ls-files -s "$sm_path" | sane_grep -v "^160000" > /dev/null 2>&1 &&
211 die "$(eval_gettext "'\$sm_path' already exists in the index and is not a submodule")"
214 if test -d "$sm_path" &&
215 test -z $(git -C "$sm_path" rev-parse --show-cdup 2>/dev/null)
216 then
217 git -C "$sm_path" rev-parse --verify -q HEAD >/dev/null ||
218 die "$(eval_gettext "'\$sm_path' does not have a commit checked out")"
221 if test -z "$force"
222 then
223 dryerr=$(git add --dry-run --ignore-missing --no-warn-embedded-repo "$sm_path" 2>&1 >/dev/null)
224 res=$?
225 if test $res -ne 0
226 then
227 echo >&2 "$dryerr"
228 exit $res
232 if test -n "$custom_name"
233 then
234 sm_name="$custom_name"
235 else
236 sm_name="$sm_path"
239 if ! git submodule--helper check-name "$sm_name"
240 then
241 die "$(eval_gettext "'$sm_name' is not a valid submodule name")"
244 # perhaps the path exists and is already a git repo, else clone it
245 if test -e "$sm_path"
246 then
247 if test -d "$sm_path"/.git || test -f "$sm_path"/.git
248 then
249 eval_gettextln "Adding existing repo at '\$sm_path' to the index"
250 else
251 die "$(eval_gettext "'\$sm_path' already exists and is not a valid git repo")"
254 else
255 if test -d ".git/modules/$sm_name"
256 then
257 if test -z "$force"
258 then
259 eval_gettextln >&2 "A git directory for '\$sm_name' is found locally with remote(s):"
260 GIT_DIR=".git/modules/$sm_name" GIT_WORK_TREE=. git remote -v | grep '(fetch)' | sed -e s,^," ", -e s,' (fetch)',, >&2
261 die "$(eval_gettextln "\
262 If you want to reuse this local git directory instead of cloning again from
263 \$realrepo
264 use the '--force' option. If the local git directory is not the correct repo
265 or you are unsure what this means choose another name with the '--name' option.")"
266 else
267 eval_gettextln "Reactivating local git directory for submodule '\$sm_name'."
270 git submodule--helper clone ${GIT_QUIET:+--quiet} ${progress:+"--progress"} --prefix "$wt_prefix" --path "$sm_path" --name "$sm_name" --url "$realrepo" ${reference:+"$reference"} ${dissociate:+"--dissociate"} ${depth:+"$depth"} || exit
272 sanitize_submodule_env
273 cd "$sm_path" &&
274 # ash fails to wordsplit ${branch:+-b "$branch"...}
275 case "$branch" in
276 '') git checkout -f -q ;;
277 ?*) git checkout -f -q -B "$branch" "origin/$branch" ;;
278 esac
279 ) || die "$(eval_gettext "Unable to checkout submodule '\$sm_path'")"
281 git config submodule."$sm_name".url "$realrepo"
283 git add --no-warn-embedded-repo $force "$sm_path" ||
284 die "$(eval_gettext "Failed to add submodule '\$sm_path'")"
286 git submodule--helper config submodule."$sm_name".path "$sm_path" &&
287 git submodule--helper config submodule."$sm_name".url "$repo" &&
288 if test -n "$branch"
289 then
290 git submodule--helper config submodule."$sm_name".branch "$branch"
291 fi &&
292 git add --force .gitmodules ||
293 die "$(eval_gettext "Failed to register submodule '\$sm_path'")"
295 # NEEDSWORK: In a multi-working-tree world, this needs to be
296 # set in the per-worktree config.
297 if git config --get submodule.active >/dev/null
298 then
299 # If the submodule being adding isn't already covered by the
300 # current configured pathspec, set the submodule's active flag
301 if ! git submodule--helper is-active "$sm_path"
302 then
303 git config submodule."$sm_name".active "true"
305 else
306 git config submodule."$sm_name".active "true"
311 # Execute an arbitrary command sequence in each checked out
312 # submodule
314 # $@ = command to execute
316 cmd_foreach()
318 # parse $args after "submodule ... foreach".
319 while test $# -ne 0
321 case "$1" in
322 -q|--quiet)
323 GIT_QUIET=1
325 --recursive)
326 recursive=1
329 usage
332 break
334 esac
335 shift
336 done
338 git ${wt_prefix:+-C "$wt_prefix"} ${prefix:+--super-prefix "$prefix"} submodule--helper foreach ${GIT_QUIET:+--quiet} ${recursive:+--recursive} -- "$@"
342 # Register submodules in .git/config
344 # $@ = requested paths (default to all)
346 cmd_init()
348 # parse $args after "submodule ... init".
349 while test $# -ne 0
351 case "$1" in
352 -q|--quiet)
353 GIT_QUIET=1
356 shift
357 break
360 usage
363 break
365 esac
366 shift
367 done
369 git ${wt_prefix:+-C "$wt_prefix"} ${prefix:+--super-prefix "$prefix"} submodule--helper init ${GIT_QUIET:+--quiet} -- "$@"
373 # Unregister submodules from .git/config and remove their work tree
375 cmd_deinit()
377 # parse $args after "submodule ... deinit".
378 deinit_all=
379 while test $# -ne 0
381 case "$1" in
382 -f|--force)
383 force=$1
385 -q|--quiet)
386 GIT_QUIET=1
388 --all)
389 deinit_all=t
392 shift
393 break
396 usage
399 break
401 esac
402 shift
403 done
405 git ${wt_prefix:+-C "$wt_prefix"} submodule--helper deinit ${GIT_QUIET:+--quiet} ${prefix:+--prefix "$prefix"} ${force:+--force} ${deinit_all:+--all} -- "$@"
408 is_tip_reachable () (
409 sanitize_submodule_env &&
410 cd "$1" &&
411 rev=$(git rev-list -n 1 "$2" --not --all 2>/dev/null) &&
412 test -z "$rev"
415 # usage: fetch_in_submodule <module_path> [<depth>] [<sha1>]
416 # Because arguments are positional, use an empty string to omit <depth>
417 # but include <sha1>.
418 fetch_in_submodule () (
419 sanitize_submodule_env &&
420 cd "$1" &&
421 if test $# -eq 3
422 then
423 echo "$3" | git fetch --stdin ${2:+"$2"}
424 else
425 git fetch ${2:+"$2"}
430 # Update each submodule path to correct revision, using clone and checkout as needed
432 # $@ = requested paths (default to all)
434 cmd_update()
436 # parse $args after "submodule ... update".
437 while test $# -ne 0
439 case "$1" in
440 -q|--quiet)
441 GIT_QUIET=1
444 unset GIT_QUIET
446 --progress)
447 progress=1
449 -i|--init)
450 init=1
452 --require-init)
453 init=1
454 require_init=1
456 --remote)
457 remote=1
459 -N|--no-fetch)
460 nofetch=1
462 -f|--force)
463 force=$1
465 -r|--rebase)
466 update="rebase"
468 --reference)
469 case "$2" in '') usage ;; esac
470 reference="--reference=$2"
471 shift
473 --reference=*)
474 reference="$1"
476 --dissociate)
477 dissociate=1
479 -m|--merge)
480 update="merge"
482 --recursive)
483 recursive=1
485 --checkout)
486 update="checkout"
488 --recommend-shallow)
489 recommend_shallow="--recommend-shallow"
491 --no-recommend-shallow)
492 recommend_shallow="--no-recommend-shallow"
494 --depth)
495 case "$2" in '') usage ;; esac
496 depth="--depth=$2"
497 shift
499 --depth=*)
500 depth=$1
502 -j|--jobs)
503 case "$2" in '') usage ;; esac
504 jobs="--jobs=$2"
505 shift
507 --jobs=*)
508 jobs=$1
510 --single-branch)
511 single_branch="--single-branch"
513 --no-single-branch)
514 single_branch="--no-single-branch"
517 shift
518 break
521 usage
524 break
526 esac
527 shift
528 done
530 if test -n "$init"
531 then
532 cmd_init "--" "$@" || return
536 git submodule--helper update-clone ${GIT_QUIET:+--quiet} \
537 ${progress:+"--progress"} \
538 ${wt_prefix:+--prefix "$wt_prefix"} \
539 ${prefix:+--recursive-prefix "$prefix"} \
540 ${update:+--update "$update"} \
541 ${reference:+"$reference"} \
542 ${dissociate:+"--dissociate"} \
543 ${depth:+--depth "$depth"} \
544 ${require_init:+--require-init} \
545 $single_branch \
546 $recommend_shallow \
547 $jobs \
548 -- \
549 "$@" || echo "#unmatched" $?
550 } | {
551 err=
552 while read -r quickabort sha1 just_cloned sm_path
554 die_if_unmatched "$quickabort" "$sha1"
556 git submodule--helper ensure-core-worktree "$sm_path" || exit 1
558 update_module=$(git submodule--helper update-module-mode $just_cloned "$sm_path" $update)
560 displaypath=$(git submodule--helper relative-path "$prefix$sm_path" "$wt_prefix")
562 if test $just_cloned -eq 1
563 then
564 subsha1=
565 else
566 subsha1=$(sanitize_submodule_env; cd "$sm_path" &&
567 git rev-parse --verify HEAD) ||
568 die "$(eval_gettext "Unable to find current revision in submodule path '\$displaypath'")"
571 if test -n "$remote"
572 then
573 branch=$(git submodule--helper remote-branch "$sm_path")
574 if test -z "$nofetch"
575 then
576 # Fetch remote before determining tracking $sha1
577 fetch_in_submodule "$sm_path" $depth ||
578 die "$(eval_gettext "Unable to fetch in submodule path '\$sm_path'")"
580 remote_name=$(sanitize_submodule_env; cd "$sm_path" && git submodule--helper print-default-remote)
581 sha1=$(sanitize_submodule_env; cd "$sm_path" &&
582 git rev-parse --verify "${remote_name}/${branch}") ||
583 die "$(eval_gettext "Unable to find current \${remote_name}/\${branch} revision in submodule path '\$sm_path'")"
586 if test "$subsha1" != "$sha1" || test -n "$force"
587 then
588 subforce=$force
589 # If we don't already have a -f flag and the submodule has never been checked out
590 if test -z "$subsha1" && test -z "$force"
591 then
592 subforce="-f"
595 if test -z "$nofetch"
596 then
597 # Run fetch only if $sha1 isn't present or it
598 # is not reachable from a ref.
599 is_tip_reachable "$sm_path" "$sha1" ||
600 fetch_in_submodule "$sm_path" $depth ||
601 say "$(eval_gettext "Unable to fetch in submodule path '\$displaypath'; trying to directly fetch \$sha1:")"
603 # Now we tried the usual fetch, but $sha1 may
604 # not be reachable from any of the refs
605 is_tip_reachable "$sm_path" "$sha1" ||
606 fetch_in_submodule "$sm_path" "$depth" "$sha1" ||
607 die "$(eval_gettext "Fetched in submodule path '\$displaypath', but it did not contain \$sha1. Direct fetching of that commit failed.")"
610 must_die_on_failure=
611 case "$update_module" in
612 checkout)
613 command="git checkout $subforce -q"
614 die_msg="$(eval_gettext "Unable to checkout '\$sha1' in submodule path '\$displaypath'")"
615 say_msg="$(eval_gettext "Submodule path '\$displaypath': checked out '\$sha1'")"
617 rebase)
618 command="git rebase ${GIT_QUIET:+--quiet}"
619 die_msg="$(eval_gettext "Unable to rebase '\$sha1' in submodule path '\$displaypath'")"
620 say_msg="$(eval_gettext "Submodule path '\$displaypath': rebased into '\$sha1'")"
621 must_die_on_failure=yes
623 merge)
624 command="git merge ${GIT_QUIET:+--quiet}"
625 die_msg="$(eval_gettext "Unable to merge '\$sha1' in submodule path '\$displaypath'")"
626 say_msg="$(eval_gettext "Submodule path '\$displaypath': merged in '\$sha1'")"
627 must_die_on_failure=yes
630 command="${update_module#!}"
631 die_msg="$(eval_gettext "Execution of '\$command \$sha1' failed in submodule path '\$displaypath'")"
632 say_msg="$(eval_gettext "Submodule path '\$displaypath': '\$command \$sha1'")"
633 must_die_on_failure=yes
636 die "$(eval_gettext "Invalid update mode '$update_module' for submodule path '$path'")"
637 esac
639 if (sanitize_submodule_env; cd "$sm_path" && $command "$sha1")
640 then
641 say "$say_msg"
642 elif test -n "$must_die_on_failure"
643 then
644 die_with_status 2 "$die_msg"
645 else
646 err="${err};$die_msg"
647 continue
651 if test -n "$recursive"
652 then
654 prefix=$(git submodule--helper relative-path "$prefix$sm_path/" "$wt_prefix")
655 wt_prefix=
656 sanitize_submodule_env
657 cd "$sm_path" &&
658 eval cmd_update
660 res=$?
661 if test $res -gt 0
662 then
663 die_msg="$(eval_gettext "Failed to recurse into submodule path '\$displaypath'")"
664 if test $res -ne 2
665 then
666 err="${err};$die_msg"
667 continue
668 else
669 die_with_status $res "$die_msg"
673 done
675 if test -n "$err"
676 then
677 OIFS=$IFS
678 IFS=';'
679 for e in $err
681 if test -n "$e"
682 then
683 echo >&2 "$e"
685 done
686 IFS=$OIFS
687 exit 1
693 # Configures a submodule's default branch
695 # $@ = requested path
697 cmd_set_branch() {
698 default=
699 branch=
701 while test $# -ne 0
703 case "$1" in
704 -q|--quiet)
705 # we don't do anything with this but we need to accept it
707 -d|--default)
708 default=1
710 -b|--branch)
711 case "$2" in '') usage ;; esac
712 branch=$2
713 shift
716 shift
717 break
720 usage
723 break
725 esac
726 shift
727 done
729 git ${wt_prefix:+-C "$wt_prefix"} ${prefix:+--super-prefix "$prefix"} submodule--helper set-branch ${GIT_QUIET:+--quiet} ${branch:+--branch "$branch"} ${default:+--default} -- "$@"
733 # Configures a submodule's remote url
735 # $@ = requested path, requested url
737 cmd_set_url() {
738 while test $# -ne 0
740 case "$1" in
741 -q|--quiet)
742 GIT_QUIET=1
745 shift
746 break
749 usage
752 break
754 esac
755 shift
756 done
758 git ${wt_prefix:+-C "$wt_prefix"} ${prefix:+--super-prefix "$prefix"} submodule--helper set-url ${GIT_QUIET:+--quiet} -- "$@"
762 # Show commit summary for submodules in index or working tree
764 # If '--cached' is given, show summary between index and given commit,
765 # or between working tree and given commit
767 # $@ = [commit (default 'HEAD'),] requested paths (default all)
769 cmd_summary() {
770 summary_limit=-1
771 for_status=
772 diff_cmd=diff-index
774 # parse $args after "submodule ... summary".
775 while test $# -ne 0
777 case "$1" in
778 --cached)
779 cached="$1"
781 --files)
782 files="$1"
784 --for-status)
785 for_status="$1"
787 -n|--summary-limit)
788 summary_limit="$2"
789 isnumber "$summary_limit" || usage
790 shift
792 --summary-limit=*)
793 summary_limit="${1#--summary-limit=}"
794 isnumber "$summary_limit" || usage
797 shift
798 break
801 usage
804 break
806 esac
807 shift
808 done
810 git ${wt_prefix:+-C "$wt_prefix"} submodule--helper summary ${prefix:+--prefix "$prefix"} ${files:+--files} ${cached:+--cached} ${for_status:+--for-status} ${summary_limit:+-n $summary_limit} -- "$@"
813 # List all submodules, prefixed with:
814 # - submodule not initialized
815 # + different revision checked out
817 # If --cached was specified the revision in the index will be printed
818 # instead of the currently checked out revision.
820 # $@ = requested paths (default to all)
822 cmd_status()
824 # parse $args after "submodule ... status".
825 while test $# -ne 0
827 case "$1" in
828 -q|--quiet)
829 GIT_QUIET=1
831 --cached)
832 cached=1
834 --recursive)
835 recursive=1
838 shift
839 break
842 usage
845 break
847 esac
848 shift
849 done
851 git ${wt_prefix:+-C "$wt_prefix"} ${prefix:+--super-prefix "$prefix"} submodule--helper status ${GIT_QUIET:+--quiet} ${cached:+--cached} ${recursive:+--recursive} -- "$@"
854 # Sync remote urls for submodules
855 # This makes the value for remote.$remote.url match the value
856 # specified in .gitmodules.
858 cmd_sync()
860 while test $# -ne 0
862 case "$1" in
863 -q|--quiet)
864 GIT_QUIET=1
865 shift
867 --recursive)
868 recursive=1
869 shift
872 shift
873 break
876 usage
879 break
881 esac
882 done
884 git ${wt_prefix:+-C "$wt_prefix"} ${prefix:+--super-prefix "$prefix"} submodule--helper sync ${GIT_QUIET:+--quiet} ${recursive:+--recursive} -- "$@"
887 cmd_absorbgitdirs()
889 git submodule--helper absorb-git-dirs --prefix "$wt_prefix" "$@"
892 # This loop parses the command line arguments to find the
893 # subcommand name to dispatch. Parsing of the subcommand specific
894 # options are primarily done by the subcommand implementations.
895 # Subcommand specific options such as --branch and --cached are
896 # parsed here as well, for backward compatibility.
898 while test $# != 0 && test -z "$command"
900 case "$1" in
901 add | foreach | init | deinit | update | set-branch | set-url | status | summary | sync | absorbgitdirs)
902 command=$1
904 -q|--quiet)
905 GIT_QUIET=1
907 -b|--branch)
908 case "$2" in
910 usage
912 esac
913 branch="$2"; shift
915 --cached)
916 cached="$1"
919 break
922 usage
925 break
927 esac
928 shift
929 done
931 # No command word defaults to "status"
932 if test -z "$command"
933 then
934 if test $# = 0
935 then
936 command=status
937 else
938 usage
942 # "-b branch" is accepted only by "add" and "set-branch"
943 if test -n "$branch" && (test "$command" != add || test "$command" != set-branch)
944 then
945 usage
948 # "--cached" is accepted only by "status" and "summary"
949 if test -n "$cached" && test "$command" != status && test "$command" != summary
950 then
951 usage
954 "cmd_$(echo $command | sed -e s/-/_/g)" "$@"