]> git.ipfire.org Git - thirdparty/git.git/blame - git-submodule.sh
Merge branch 'jc/maint-read-tree-multi'
[thirdparty/git.git] / git-submodule.sh
CommitLineData
70c7ac22
LH
1#!/bin/sh
2#
ecda0723 3# git-submodules.sh: add, init, update or list git submodules
70c7ac22
LH
4#
5# Copyright (c) 2007 Lars Hjemli
6
f2dc06a3 7USAGE="[--quiet] [--cached] \
835a3eea 8[add [-b branch] <repo> <path>]|[status|init|update [-i|--init] [-N|--no-fetch]|summary [-n|--summary-limit <n>] [<commit>]] \
2327f61e 9[--] [<path>...]|[foreach <command>]|[sync [--] [<path>...]]"
8f321a39 10OPTIONS_SPEC=
70c7ac22 11. git-sh-setup
98fcf840 12. git-parse-remote
70c7ac22
LH
13require_work_tree
14
5c08dbbd 15command=
ecda0723 16branch=
70c7ac22
LH
17quiet=
18cached=
31ca3ac3 19nofetch=
70c7ac22
LH
20
21#
22# print stuff on stdout unless -q was specified
23#
24say()
25{
26 if test -z "$quiet"
27 then
28 echo "$@"
29 fi
30}
31
f31a522a
ML
32# Resolve relative url by appending to parent's url
33resolve_relative_url ()
34{
98fcf840 35 remote=$(get_default_remote)
8e7e6f39
ML
36 remoteurl=$(git config "remote.$remote.url") ||
37 die "remote ($remote) does not have a url defined in .git/config"
f31a522a 38 url="$1"
99b120af 39 remoteurl=${remoteurl%/}
f31a522a
ML
40 while test -n "$url"
41 do
42 case "$url" in
43 ../*)
44 url="${url#../}"
45 remoteurl="${remoteurl%/*}"
46 ;;
47 ./*)
48 url="${url#./}"
49 ;;
50 *)
51 break;;
52 esac
53 done
99b120af 54 echo "$remoteurl/${url%/}"
f31a522a
ML
55}
56
a7b3269c
DA
57#
58# Get submodule info for registered submodules
59# $@ = path to limit submodule list
60#
61module_list()
62{
496917b7 63 git ls-files --error-unmatch --stage -- "$@" | grep '^160000 '
a7b3269c
DA
64}
65
941987a5
LH
66#
67# Map submodule path to submodule name
68#
69# $1 = path
70#
71module_name()
72{
537601ac 73 # Do we have "submodule.<something>.path = $1" defined in .gitmodules file?
fe22e542 74 re=$(printf '%s\n' "$1" | sed -e 's/[].[^$\\*]/\\&/g')
a5099bb4 75 name=$( git config -f .gitmodules --get-regexp '^submodule\..*\.path$' |
537601ac 76 sed -n -e 's|^submodule\.\(.*\)\.path '"$re"'$|\1|p' )
941987a5
LH
77 test -z "$name" &&
78 die "No submodule mapping found in .gitmodules for path '$path'"
79 echo "$name"
80}
33aa6fff
LH
81
82#
83# Clone a submodule
84#
23a485e3 85# Prior to calling, cmd_update checks that a possibly existing
ecda0723 86# path is not a git repository.
23a485e3 87# Likewise, cmd_add checks that path does not exist at all,
ecda0723
SV
88# since it is the location of a new submodule.
89#
33aa6fff
LH
90module_clone()
91{
92 path=$1
93 url=$2
94
95 # If there already is a directory at the submodule path,
96 # expect it to be empty (since that is the default checkout
97 # action) and try to remove it.
98 # Note: if $path is a symlink to a directory the test will
99 # succeed but the rmdir will fail. We might want to fix this.
100 if test -d "$path"
101 then
102 rmdir "$path" 2>/dev/null ||
103 die "Directory '$path' exist, but is neither empty nor a git repository"
104 fi
105
106 test -e "$path" &&
107 die "A file already exist at path '$path'"
108
109 git-clone -n "$url" "$path" ||
941987a5 110 die "Clone of '$url' into submodule path '$path' failed"
33aa6fff
LH
111}
112
ecda0723
SV
113#
114# Add a new submodule to the working tree, .gitmodules and the index
115#
ec05df35 116# $@ = repo path
ecda0723
SV
117#
118# optional branch is stored in global branch variable
119#
23a485e3 120cmd_add()
ecda0723 121{
5c08dbbd
JH
122 # parse $args after "submodule ... add".
123 while test $# -ne 0
124 do
125 case "$1" in
126 -b | --branch)
127 case "$2" in '') usage ;; esac
128 branch=$2
129 shift
130 ;;
131 -q|--quiet)
132 quiet=1
133 ;;
134 --)
135 shift
136 break
137 ;;
138 -*)
139 usage
140 ;;
141 *)
142 break
143 ;;
144 esac
145 shift
146 done
147
ecda0723
SV
148 repo=$1
149 path=$2
150
ec05df35 151 if test -z "$repo" -o -z "$path"; then
ecda0723
SV
152 usage
153 fi
154
ec05df35
ML
155 # assure repo is absolute or relative to parent
156 case "$repo" in
157 ./*|../*)
158 # dereference source url relative to parent's url
159 realrepo=$(resolve_relative_url "$repo") || exit
160 ;;
161 *:*|/*)
162 # absolute url
163 realrepo=$repo
164 ;;
165 *)
166 die "repo URL: '$repo' must be absolute or begin with ./|../"
167 ;;
168 esac
169
db75ada5
MG
170 # normalize path:
171 # multiple //; leading ./; /./; /../; trailing /
172 path=$(printf '%s/\n' "$path" |
173 sed -e '
174 s|//*|/|g
175 s|^\(\./\)*||
176 s|/\./|/|g
177 :start
178 s|\([^/]*\)/\.\./||
179 tstart
180 s|/*$||
181 ')
5be60078 182 git ls-files --error-unmatch "$path" > /dev/null 2>&1 &&
ecda0723
SV
183 die "'$path' already exists in the index"
184
d4264ca3
ML
185 # perhaps the path exists and is already a git repo, else clone it
186 if test -e "$path"
187 then
e9656473 188 if test -d "$path"/.git -o -f "$path"/.git
d4264ca3
ML
189 then
190 echo "Adding existing repo at '$path' to the index"
191 else
192 die "'$path' already exists and is not a valid git repo"
193 fi
c2f93917
ML
194
195 case "$repo" in
196 ./*|../*)
197 url=$(resolve_relative_url "$repo") || exit
198 ;;
199 *)
200 url="$repo"
201 ;;
202 esac
203 git config submodule."$path".url "$url"
d4264ca3 204 else
d4264ca3
ML
205
206 module_clone "$path" "$realrepo" || exit
ea10b60c
BJ
207 (
208 unset GIT_DIR
209 cd "$path" &&
210 # ash fails to wordsplit ${branch:+-b "$branch"...}
211 case "$branch" in
212 '') git checkout -f -q ;;
213 ?*) git checkout -f -q -b "$branch" "origin/$branch" ;;
214 esac
215 ) || die "Unable to checkout submodule '$path'"
d4264ca3
ML
216 fi
217
ecda0723
SV
218 git add "$path" ||
219 die "Failed to add submodule '$path'"
220
a5099bb4
IY
221 git config -f .gitmodules submodule."$path".path "$path" &&
222 git config -f .gitmodules submodule."$path".url "$repo" &&
ecda0723
SV
223 git add .gitmodules ||
224 die "Failed to register submodule '$path'"
225}
226
19a31f9c
ML
227#
228# Execute an arbitrary command sequence in each checked out
229# submodule
230#
231# $@ = command to execute
232#
233cmd_foreach()
234{
a7b3269c 235 module_list |
19a31f9c
ML
236 while read mode sha1 stage path
237 do
238 if test -e "$path"/.git
239 then
240 say "Entering '$path'"
241 (cd "$path" && eval "$@") ||
242 die "Stopping at '$path'; script returned non-zero status."
243 fi
244 done
245}
246
70c7ac22 247#
211b7f19 248# Register submodules in .git/config
70c7ac22
LH
249#
250# $@ = requested paths (default to all)
251#
23a485e3 252cmd_init()
70c7ac22 253{
5c08dbbd
JH
254 # parse $args after "submodule ... init".
255 while test $# -ne 0
256 do
257 case "$1" in
258 -q|--quiet)
259 quiet=1
260 ;;
261 --)
262 shift
263 break
264 ;;
265 -*)
266 usage
267 ;;
268 *)
269 break
270 ;;
271 esac
272 shift
273 done
274
a7b3269c 275 module_list "$@" |
70c7ac22
LH
276 while read mode sha1 stage path
277 do
211b7f19 278 # Skip already registered paths
941987a5 279 name=$(module_name "$path") || exit
5be60078 280 url=$(git config submodule."$name".url)
211b7f19 281 test -z "$url" || continue
70c7ac22 282
a5099bb4 283 url=$(git config -f .gitmodules submodule."$name".url)
70c7ac22 284 test -z "$url" &&
941987a5 285 die "No url found for submodule path '$path' in .gitmodules"
70c7ac22 286
f31a522a
ML
287 # Possibly a url relative to parent
288 case "$url" in
289 ./*|../*)
8e7e6f39 290 url=$(resolve_relative_url "$url") || exit
f31a522a
ML
291 ;;
292 esac
293
5be60078 294 git config submodule."$name".url "$url" ||
941987a5 295 die "Failed to register url for submodule path '$path'"
70c7ac22 296
941987a5 297 say "Submodule '$name' ($url) registered for path '$path'"
70c7ac22
LH
298 done
299}
300
301#
211b7f19 302# Update each submodule path to correct revision, using clone and checkout as needed
70c7ac22
LH
303#
304# $@ = requested paths (default to all)
305#
23a485e3 306cmd_update()
70c7ac22 307{
5c08dbbd
JH
308 # parse $args after "submodule ... update".
309 while test $# -ne 0
310 do
311 case "$1" in
312 -q|--quiet)
d1f63a37 313 shift
5c08dbbd
JH
314 quiet=1
315 ;;
be4d2c83
JS
316 -i|--init)
317 shift
318 cmd_init "$@" || return
319 ;;
31ca3ac3
FF
320 -N|--no-fetch)
321 shift
322 nofetch=1
323 ;;
5c08dbbd
JH
324 --)
325 shift
326 break
327 ;;
328 -*)
329 usage
330 ;;
331 *)
332 break
333 ;;
334 esac
5c08dbbd
JH
335 done
336
a7b3269c 337 module_list "$@" |
70c7ac22
LH
338 while read mode sha1 stage path
339 do
941987a5 340 name=$(module_name "$path") || exit
5be60078 341 url=$(git config submodule."$name".url)
211b7f19 342 if test -z "$url"
70c7ac22
LH
343 then
344 # Only mention uninitialized submodules when its
345 # path have been specified
346 test "$#" != "0" &&
989206f5 347 say "Submodule path '$path' not initialized" &&
be4d2c83 348 say "Maybe you want to use 'update --init'?"
211b7f19
LH
349 continue
350 fi
351
ba88a1fe 352 if ! test -d "$path"/.git -o -f "$path"/.git
211b7f19
LH
353 then
354 module_clone "$path" "$url" || exit
bf2d8246
LH
355 subsha1=
356 else
51884080 357 subsha1=$(unset GIT_DIR; cd "$path" &&
5be60078 358 git rev-parse --verify HEAD) ||
941987a5 359 die "Unable to find current revision in submodule path '$path'"
70c7ac22 360 fi
211b7f19 361
70c7ac22
LH
362 if test "$subsha1" != "$sha1"
363 then
b9b378a0
PY
364 force=
365 if test -z "$subsha1"
366 then
367 force="-f"
368 fi
31ca3ac3
FF
369
370 if test -z "$nofetch"
371 then
372 (unset GIT_DIR; cd "$path" &&
373 git-fetch) ||
374 die "Unable to fetch in submodule path '$path'"
375 fi
376
377 (unset GIT_DIR; cd "$path" &&
378 git-checkout $force -q "$sha1") ||
941987a5 379 die "Unable to checkout '$sha1' in submodule path '$path'"
70c7ac22 380
941987a5 381 say "Submodule path '$path': checked out '$sha1'"
70c7ac22
LH
382 fi
383 done
384}
385
bffe71f4
EM
386set_name_rev () {
387 revname=$( (
51884080 388 unset GIT_DIR
bffe71f4 389 cd "$1" && {
5be60078
JH
390 git describe "$2" 2>/dev/null ||
391 git describe --tags "$2" 2>/dev/null ||
f669ac0b
ML
392 git describe --contains "$2" 2>/dev/null ||
393 git describe --all --always "$2"
bffe71f4
EM
394 }
395 ) )
396 test -z "$revname" || revname=" ($revname)"
397}
28f9af5d
PY
398#
399# Show commit summary for submodules in index or working tree
400#
401# If '--cached' is given, show summary between index and given commit,
402# or between working tree and given commit
403#
404# $@ = [commit (default 'HEAD'),] requested paths (default all)
405#
406cmd_summary() {
f2dc06a3 407 summary_limit=-1
d0f64dd4 408 for_status=
f2dc06a3 409
28f9af5d
PY
410 # parse $args after "submodule ... summary".
411 while test $# -ne 0
412 do
413 case "$1" in
414 --cached)
415 cached="$1"
416 ;;
d0f64dd4
PY
417 --for-status)
418 for_status="$1"
419 ;;
f2dc06a3
PY
420 -n|--summary-limit)
421 if summary_limit=$(($2 + 0)) 2>/dev/null && test "$summary_limit" = "$2"
422 then
423 :
424 else
425 usage
426 fi
427 shift
428 ;;
28f9af5d
PY
429 --)
430 shift
431 break
432 ;;
433 -*)
434 usage
435 ;;
436 *)
437 break
438 ;;
439 esac
440 shift
441 done
bffe71f4 442
f2dc06a3
PY
443 test $summary_limit = 0 && return
444
30353a40 445 if rev=$(git rev-parse -q --verify "$1^0")
28f9af5d
PY
446 then
447 head=$rev
448 shift
449 else
450 head=HEAD
451 fi
452
453 cd_to_toplevel
454 # Get modified modules cared by user
455 modules=$(git diff-index $cached --raw $head -- "$@" |
759ad19e 456 egrep '^:([0-7]* )?160000' |
28f9af5d
PY
457 while read mod_src mod_dst sha1_src sha1_dst status name
458 do
459 # Always show modules deleted or type-changed (blob<->module)
460 test $status = D -o $status = T && echo "$name" && continue
461 # Also show added or modified modules which are checked out
462 GIT_DIR="$name/.git" git-rev-parse --git-dir >/dev/null 2>&1 &&
463 echo "$name"
464 done
465 )
1cb639e6 466
d0f64dd4
PY
467 test -z "$modules" && return
468
1cb639e6 469 git diff-index $cached --raw $head -- $modules |
759ad19e 470 egrep '^:([0-7]* )?160000' |
1cb639e6
PY
471 cut -c2- |
472 while read mod_src mod_dst sha1_src sha1_dst status name
473 do
474 if test -z "$cached" &&
475 test $sha1_dst = 0000000000000000000000000000000000000000
476 then
477 case "$mod_dst" in
478 160000)
479 sha1_dst=$(GIT_DIR="$name/.git" git rev-parse HEAD)
480 ;;
481 100644 | 100755 | 120000)
482 sha1_dst=$(git hash-object $name)
483 ;;
484 000000)
485 ;; # removed
486 *)
487 # unexpected type
488 echo >&2 "unexpected mode $mod_dst"
489 continue ;;
490 esac
491 fi
492 missing_src=
493 missing_dst=
494
495 test $mod_src = 160000 &&
30353a40 496 ! GIT_DIR="$name/.git" git-rev-parse -q --verify $sha1_src^0 >/dev/null &&
1cb639e6
PY
497 missing_src=t
498
499 test $mod_dst = 160000 &&
30353a40 500 ! GIT_DIR="$name/.git" git-rev-parse -q --verify $sha1_dst^0 >/dev/null &&
1cb639e6 501 missing_dst=t
bffe71f4 502
1cb639e6
PY
503 total_commits=
504 case "$missing_src,$missing_dst" in
505 t,)
506 errmsg=" Warn: $name doesn't contain commit $sha1_src"
507 ;;
508 ,t)
509 errmsg=" Warn: $name doesn't contain commit $sha1_dst"
510 ;;
511 t,t)
512 errmsg=" Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
513 ;;
514 *)
515 errmsg=
516 total_commits=$(
517 if test $mod_src = 160000 -a $mod_dst = 160000
518 then
519 range="$sha1_src...$sha1_dst"
520 elif test $mod_src = 160000
521 then
522 range=$sha1_src
523 else
524 range=$sha1_dst
525 fi
526 GIT_DIR="$name/.git" \
527 git log --pretty=oneline --first-parent $range | wc -l
528 )
eed35595 529 total_commits=" ($(($total_commits + 0)))"
1cb639e6
PY
530 ;;
531 esac
532
533 sha1_abbr_src=$(echo $sha1_src | cut -c1-7)
534 sha1_abbr_dst=$(echo $sha1_dst | cut -c1-7)
535 if test $status = T
536 then
537 if test $mod_dst = 160000
538 then
539 echo "* $name $sha1_abbr_src(blob)->$sha1_abbr_dst(submodule)$total_commits:"
540 else
541 echo "* $name $sha1_abbr_src(submodule)->$sha1_abbr_dst(blob)$total_commits:"
542 fi
543 else
544 echo "* $name $sha1_abbr_src...$sha1_abbr_dst$total_commits:"
545 fi
546 if test -n "$errmsg"
547 then
548 # Don't give error msg for modification whose dst is not submodule
549 # i.e. deleted or changed to blob
550 test $mod_dst = 160000 && echo "$errmsg"
551 else
552 if test $mod_src = 160000 -a $mod_dst = 160000
553 then
f2dc06a3
PY
554 limit=
555 test $summary_limit -gt 0 && limit="-$summary_limit"
1cb639e6 556 GIT_DIR="$name/.git" \
f2dc06a3 557 git log $limit --pretty='format: %m %s' \
1cb639e6
PY
558 --first-parent $sha1_src...$sha1_dst
559 elif test $mod_dst = 160000
560 then
561 GIT_DIR="$name/.git" \
562 git log --pretty='format: > %s' -1 $sha1_dst
563 else
564 GIT_DIR="$name/.git" \
565 git log --pretty='format: < %s' -1 $sha1_src
566 fi
567 echo
568 fi
569 echo
d0f64dd4
PY
570 done |
571 if test -n "$for_status"; then
572 echo "# Modified submodules:"
573 echo "#"
574 sed -e 's|^|# |' -e 's|^# $|#|'
575 else
576 cat
577 fi
28f9af5d 578}
70c7ac22 579#
941987a5 580# List all submodules, prefixed with:
70c7ac22
LH
581# - submodule not initialized
582# + different revision checked out
583#
584# If --cached was specified the revision in the index will be printed
585# instead of the currently checked out revision.
586#
587# $@ = requested paths (default to all)
588#
23a485e3 589cmd_status()
70c7ac22 590{
5c08dbbd
JH
591 # parse $args after "submodule ... status".
592 while test $# -ne 0
593 do
594 case "$1" in
595 -q|--quiet)
596 quiet=1
597 ;;
598 --cached)
599 cached=1
600 ;;
601 --)
602 shift
603 break
604 ;;
605 -*)
606 usage
607 ;;
608 *)
609 break
610 ;;
611 esac
612 shift
613 done
614
a7b3269c 615 module_list "$@" |
70c7ac22
LH
616 while read mode sha1 stage path
617 do
941987a5 618 name=$(module_name "$path") || exit
5be60078 619 url=$(git config submodule."$name".url)
ba88a1fe 620 if test -z "$url" || ! test -d "$path"/.git -o -f "$path"/.git
70c7ac22
LH
621 then
622 say "-$sha1 $path"
623 continue;
624 fi
41c7c1bd 625 set_name_rev "$path" "$sha1"
70c7ac22
LH
626 if git diff-files --quiet -- "$path"
627 then
bffe71f4 628 say " $sha1 $path$revname"
70c7ac22
LH
629 else
630 if test -z "$cached"
631 then
51884080 632 sha1=$(unset GIT_DIR; cd "$path" && git rev-parse --verify HEAD)
41c7c1bd 633 set_name_rev "$path" "$sha1"
70c7ac22 634 fi
bffe71f4 635 say "+$sha1 $path$revname"
70c7ac22
LH
636 fi
637 done
638}
2327f61e
DA
639#
640# Sync remote urls for submodules
641# This makes the value for remote.$remote.url match the value
642# specified in .gitmodules.
643#
644cmd_sync()
645{
646 while test $# -ne 0
647 do
648 case "$1" in
649 -q|--quiet)
650 quiet=1
651 shift
652 ;;
653 --)
654 shift
655 break
656 ;;
657 -*)
658 usage
659 ;;
660 *)
661 break
662 ;;
663 esac
664 done
665 cd_to_toplevel
666 module_list "$@" |
667 while read mode sha1 stage path
668 do
669 name=$(module_name "$path")
670 url=$(git config -f .gitmodules --get submodule."$name".url)
baede9f8
JH
671
672 # Possibly a url relative to parent
673 case "$url" in
674 ./*|../*)
675 url=$(resolve_relative_url "$url") || exit
676 ;;
677 esac
678
2327f61e
DA
679 if test -e "$path"/.git
680 then
681 (
682 unset GIT_DIR
683 cd "$path"
684 remote=$(get_default_remote)
685 say "Synchronizing submodule url for '$name'"
686 git config remote."$remote".url "$url"
687 )
688 fi
689 done
690}
70c7ac22 691
5c08dbbd
JH
692# This loop parses the command line arguments to find the
693# subcommand name to dispatch. Parsing of the subcommand specific
694# options are primarily done by the subcommand implementations.
695# Subcommand specific options such as --branch and --cached are
696# parsed here as well, for backward compatibility.
697
698while test $# != 0 && test -z "$command"
70c7ac22
LH
699do
700 case "$1" in
2327f61e 701 add | foreach | init | update | status | summary | sync)
5c08dbbd 702 command=$1
70c7ac22
LH
703 ;;
704 -q|--quiet)
705 quiet=1
706 ;;
ecda0723
SV
707 -b|--branch)
708 case "$2" in
709 '')
710 usage
711 ;;
712 esac
713 branch="$2"; shift
714 ;;
70c7ac22 715 --cached)
28f9af5d 716 cached="$1"
70c7ac22
LH
717 ;;
718 --)
719 break
720 ;;
721 -*)
722 usage
723 ;;
724 *)
725 break
726 ;;
727 esac
728 shift
729done
730
5c08dbbd
JH
731# No command word defaults to "status"
732test -n "$command" || command=status
733
734# "-b branch" is accepted only by "add"
735if test -n "$branch" && test "$command" != add
736then
ecda0723 737 usage
5c08dbbd
JH
738fi
739
28f9af5d
PY
740# "--cached" is accepted only by "status" and "summary"
741if test -n "$cached" && test "$command" != status -a "$command" != summary
5c08dbbd 742then
70c7ac22 743 usage
5c08dbbd
JH
744fi
745
746"cmd_$command" "$@"