submodule: process conflicting submodules only once
[git/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
1d5bec8b 7dashless=$(basename "$0" | sed -e 's/-/ /')
d27b876b 8USAGE="[--quiet] add [-b branch] [-f|--force] [--reference <repository>] [--] <repository> [<path>]
64b19ffe 9 or: $dashless [--quiet] status [--cached] [--recursive] [--] [<path>...]
1d5bec8b 10 or: $dashless [--quiet] init [--] [<path>...]
b13fd5c1 11 or: $dashless [--quiet] update [--init] [-N|--no-fetch] [--rebase] [--reference <repository>] [--merge] [--recursive] [--] [<path>...]
adc54235 12 or: $dashless [--quiet] summary [--cached|--files] [--summary-limit <n>] [commit] [--] [<path>...]
15fc56a8 13 or: $dashless [--quiet] foreach [--recursive] <command>
1d5bec8b 14 or: $dashless [--quiet] sync [--] [<path>...]"
8f321a39 15OPTIONS_SPEC=
70c7ac22 16. git-sh-setup
98fcf840 17. git-parse-remote
70c7ac22
LH
18require_work_tree
19
5c08dbbd 20command=
ecda0723 21branch=
d27b876b 22force=
d92a3959 23reference=
70c7ac22 24cached=
48bb3033
GP
25recursive=
26init=
1c244f6e 27files=
31ca3ac3 28nofetch=
32948425 29update=
15fc56a8 30prefix=
70c7ac22 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%/}
ea640cc6 40 sep=/
f31a522a
ML
41 while test -n "$url"
42 do
43 case "$url" in
44 ../*)
45 url="${url#../}"
ea640cc6
TR
46 case "$remoteurl" in
47 */*)
48 remoteurl="${remoteurl%/*}"
49 ;;
50 *:*)
51 remoteurl="${remoteurl%:*}"
52 sep=:
53 ;;
54 *)
55 die "cannot strip one component off url '$remoteurl'"
56 ;;
57 esac
f31a522a
ML
58 ;;
59 ./*)
60 url="${url#./}"
61 ;;
62 *)
63 break;;
64 esac
65 done
ea640cc6 66 echo "$remoteurl$sep${url%/}"
f31a522a
ML
67}
68
a7b3269c
DA
69#
70# Get submodule info for registered submodules
71# $@ = path to limit submodule list
72#
73module_list()
74{
313ee0d6
NMC
75 git ls-files --error-unmatch --stage -- "$@" |
76 perl -e '
77 my %unmerged = ();
78 my ($null_sha1) = ("0" x 40);
79 while (<STDIN>) {
80 chomp;
81 my ($mode, $sha1, $stage, $path) =
82 /^([0-7]+) ([0-9a-f]{40}) ([0-3])\t(.*)$/;
83 next unless $mode eq "160000";
84 if ($stage ne "0") {
85 if (!$unmerged{$path}++) {
86 print "$mode $null_sha1 U\t$path\n";
87 }
88 next;
89 }
90 print "$_\n";
91 }
92 '
a7b3269c
DA
93}
94
941987a5
LH
95#
96# Map submodule path to submodule name
97#
98# $1 = path
99#
100module_name()
101{
537601ac 102 # Do we have "submodule.<something>.path = $1" defined in .gitmodules file?
fe22e542 103 re=$(printf '%s\n' "$1" | sed -e 's/[].[^$\\*]/\\&/g')
a5099bb4 104 name=$( git config -f .gitmodules --get-regexp '^submodule\..*\.path$' |
537601ac 105 sed -n -e 's|^submodule\.\(.*\)\.path '"$re"'$|\1|p' )
941987a5
LH
106 test -z "$name" &&
107 die "No submodule mapping found in .gitmodules for path '$path'"
108 echo "$name"
109}
33aa6fff
LH
110
111#
112# Clone a submodule
113#
23a485e3 114# Prior to calling, cmd_update checks that a possibly existing
ecda0723 115# path is not a git repository.
23a485e3 116# Likewise, cmd_add checks that path does not exist at all,
ecda0723
SV
117# since it is the location of a new submodule.
118#
33aa6fff
LH
119module_clone()
120{
121 path=$1
122 url=$2
d92a3959 123 reference="$3"
33aa6fff 124
d92a3959
MT
125 if test -n "$reference"
126 then
127 git-clone "$reference" -n "$url" "$path"
128 else
129 git-clone -n "$url" "$path"
130 fi ||
941987a5 131 die "Clone of '$url' into submodule path '$path' failed"
33aa6fff
LH
132}
133
ecda0723
SV
134#
135# Add a new submodule to the working tree, .gitmodules and the index
136#
ec05df35 137# $@ = repo path
ecda0723
SV
138#
139# optional branch is stored in global branch variable
140#
23a485e3 141cmd_add()
ecda0723 142{
5c08dbbd
JH
143 # parse $args after "submodule ... add".
144 while test $# -ne 0
145 do
146 case "$1" in
147 -b | --branch)
148 case "$2" in '') usage ;; esac
149 branch=$2
150 shift
151 ;;
d27b876b
JL
152 -f | --force)
153 force=$1
154 ;;
5c08dbbd 155 -q|--quiet)
2e6a30ef 156 GIT_QUIET=1
5c08dbbd 157 ;;
d92a3959
MT
158 --reference)
159 case "$2" in '') usage ;; esac
160 reference="--reference=$2"
161 shift
162 ;;
163 --reference=*)
164 reference="$1"
165 shift
166 ;;
5c08dbbd
JH
167 --)
168 shift
169 break
170 ;;
171 -*)
172 usage
173 ;;
174 *)
175 break
176 ;;
177 esac
178 shift
179 done
180
ecda0723
SV
181 repo=$1
182 path=$2
183
1414e578
JL
184 if test -z "$path"; then
185 path=$(echo "$repo" |
186 sed -e 's|/$||' -e 's|:*/*\.git$||' -e 's|.*[/:]||g')
187 fi
188
ec05df35 189 if test -z "$repo" -o -z "$path"; then
ecda0723
SV
190 usage
191 fi
192
ec05df35
ML
193 # assure repo is absolute or relative to parent
194 case "$repo" in
195 ./*|../*)
196 # dereference source url relative to parent's url
197 realrepo=$(resolve_relative_url "$repo") || exit
198 ;;
199 *:*|/*)
200 # absolute url
201 realrepo=$repo
202 ;;
203 *)
204 die "repo URL: '$repo' must be absolute or begin with ./|../"
205 ;;
206 esac
207
db75ada5
MG
208 # normalize path:
209 # multiple //; leading ./; /./; /../; trailing /
210 path=$(printf '%s/\n' "$path" |
211 sed -e '
212 s|//*|/|g
213 s|^\(\./\)*||
214 s|/\./|/|g
215 :start
216 s|\([^/]*\)/\.\./||
217 tstart
218 s|/*$||
219 ')
5be60078 220 git ls-files --error-unmatch "$path" > /dev/null 2>&1 &&
ecda0723
SV
221 die "'$path' already exists in the index"
222
d27b876b
JL
223 if test -z "$force" && ! git add --dry-run --ignore-missing "$path" > /dev/null 2>&1
224 then
225 echo >&2 "The following path is ignored by one of your .gitignore files:" &&
226 echo >&2 $path &&
227 echo >&2 "Use -f if you really want to add it."
228 exit 1
229 fi
230
d4264ca3
ML
231 # perhaps the path exists and is already a git repo, else clone it
232 if test -e "$path"
233 then
e9656473 234 if test -d "$path"/.git -o -f "$path"/.git
d4264ca3
ML
235 then
236 echo "Adding existing repo at '$path' to the index"
237 else
238 die "'$path' already exists and is not a valid git repo"
239 fi
c2f93917
ML
240
241 case "$repo" in
242 ./*|../*)
243 url=$(resolve_relative_url "$repo") || exit
244 ;;
245 *)
246 url="$repo"
247 ;;
248 esac
249 git config submodule."$path".url "$url"
d4264ca3 250 else
d4264ca3 251
d92a3959 252 module_clone "$path" "$realrepo" "$reference" || exit
ea10b60c 253 (
74ae1419 254 clear_local_git_env
ea10b60c
BJ
255 cd "$path" &&
256 # ash fails to wordsplit ${branch:+-b "$branch"...}
257 case "$branch" in
258 '') git checkout -f -q ;;
502dc5b6 259 ?*) git checkout -f -q -B "$branch" "origin/$branch" ;;
ea10b60c
BJ
260 esac
261 ) || die "Unable to checkout submodule '$path'"
d4264ca3
ML
262 fi
263
d27b876b 264 git add $force "$path" ||
ecda0723
SV
265 die "Failed to add submodule '$path'"
266
a5099bb4
IY
267 git config -f .gitmodules submodule."$path".path "$path" &&
268 git config -f .gitmodules submodule."$path".url "$repo" &&
31991b02 269 git add --force .gitmodules ||
ecda0723
SV
270 die "Failed to register submodule '$path'"
271}
272
19a31f9c
ML
273#
274# Execute an arbitrary command sequence in each checked out
275# submodule
276#
277# $@ = command to execute
278#
279cmd_foreach()
280{
1d5bec8b
JH
281 # parse $args after "submodule ... foreach".
282 while test $# -ne 0
283 do
284 case "$1" in
285 -q|--quiet)
286 GIT_QUIET=1
287 ;;
15fc56a8
JH
288 --recursive)
289 recursive=1
290 ;;
1d5bec8b
JH
291 -*)
292 usage
293 ;;
294 *)
295 break
296 ;;
297 esac
298 shift
299 done
300
f030c96d
ÆAB
301 toplevel=$(pwd)
302
a7b3269c 303 module_list |
19a31f9c
ML
304 while read mode sha1 stage path
305 do
306 if test -e "$path"/.git
307 then
15fc56a8 308 say "Entering '$prefix$path'"
1e7f2aad 309 name=$(module_name "$path")
15fc56a8
JH
310 (
311 prefix="$prefix$path/"
74ae1419 312 clear_local_git_env
15fc56a8
JH
313 cd "$path" &&
314 eval "$@" &&
315 if test -n "$recursive"
316 then
317 cmd_foreach "--recursive" "$@"
318 fi
319 ) ||
19a31f9c
ML
320 die "Stopping at '$path'; script returned non-zero status."
321 fi
322 done
323}
324
70c7ac22 325#
211b7f19 326# Register submodules in .git/config
70c7ac22
LH
327#
328# $@ = requested paths (default to all)
329#
23a485e3 330cmd_init()
70c7ac22 331{
5c08dbbd
JH
332 # parse $args after "submodule ... init".
333 while test $# -ne 0
334 do
335 case "$1" in
336 -q|--quiet)
2e6a30ef 337 GIT_QUIET=1
5c08dbbd
JH
338 ;;
339 --)
340 shift
341 break
342 ;;
343 -*)
344 usage
345 ;;
346 *)
347 break
348 ;;
349 esac
350 shift
351 done
352
a7b3269c 353 module_list "$@" |
70c7ac22
LH
354 while read mode sha1 stage path
355 do
211b7f19 356 # Skip already registered paths
941987a5 357 name=$(module_name "$path") || exit
5be60078 358 url=$(git config submodule."$name".url)
211b7f19 359 test -z "$url" || continue
70c7ac22 360
a5099bb4 361 url=$(git config -f .gitmodules submodule."$name".url)
70c7ac22 362 test -z "$url" &&
941987a5 363 die "No url found for submodule path '$path' in .gitmodules"
70c7ac22 364
f31a522a
ML
365 # Possibly a url relative to parent
366 case "$url" in
367 ./*|../*)
8e7e6f39 368 url=$(resolve_relative_url "$url") || exit
f31a522a
ML
369 ;;
370 esac
371
5be60078 372 git config submodule."$name".url "$url" ||
941987a5 373 die "Failed to register url for submodule path '$path'"
70c7ac22 374
32948425
JH
375 upd="$(git config -f .gitmodules submodule."$name".update)"
376 test -z "$upd" ||
377 git config submodule."$name".update "$upd" ||
378 die "Failed to register update mode for submodule path '$path'"
ca2cedba 379
941987a5 380 say "Submodule '$name' ($url) registered for path '$path'"
70c7ac22
LH
381 done
382}
383
384#
211b7f19 385# Update each submodule path to correct revision, using clone and checkout as needed
70c7ac22
LH
386#
387# $@ = requested paths (default to all)
388#
23a485e3 389cmd_update()
70c7ac22 390{
5c08dbbd 391 # parse $args after "submodule ... update".
98dbe63d 392 orig_flags=
5c08dbbd
JH
393 while test $# -ne 0
394 do
395 case "$1" in
396 -q|--quiet)
2e6a30ef 397 GIT_QUIET=1
5c08dbbd 398 ;;
be4d2c83 399 -i|--init)
d92a3959 400 init=1
be4d2c83 401 ;;
31ca3ac3 402 -N|--no-fetch)
31ca3ac3
FF
403 nofetch=1
404 ;;
ca2cedba 405 -r|--rebase)
32948425 406 update="rebase"
ca2cedba 407 ;;
d92a3959
MT
408 --reference)
409 case "$2" in '') usage ;; esac
410 reference="--reference=$2"
98dbe63d
KB
411 orig_flags="$orig_flags $(git rev-parse --sq-quote "$1")"
412 shift
d92a3959
MT
413 ;;
414 --reference=*)
415 reference="$1"
d92a3959 416 ;;
42b49178 417 -m|--merge)
42b49178
JH
418 update="merge"
419 ;;
b13fd5c1 420 --recursive)
b13fd5c1
JH
421 recursive=1
422 ;;
5c08dbbd
JH
423 --)
424 shift
425 break
426 ;;
427 -*)
428 usage
429 ;;
430 *)
431 break
432 ;;
433 esac
98dbe63d
KB
434 orig_flags="$orig_flags $(git rev-parse --sq-quote "$1")"
435 shift
5c08dbbd
JH
436 done
437
d92a3959
MT
438 if test -n "$init"
439 then
440 cmd_init "--" "$@" || return
441 fi
442
1b4735d9 443 cloned_modules=
a7b3269c 444 module_list "$@" |
70c7ac22
LH
445 while read mode sha1 stage path
446 do
313ee0d6
NMC
447 if test "$stage" = U
448 then
449 echo >&2 "Skipping unmerged submodule $path"
450 continue
451 fi
941987a5 452 name=$(module_name "$path") || exit
5be60078 453 url=$(git config submodule."$name".url)
32948425 454 update_module=$(git config submodule."$name".update)
211b7f19 455 if test -z "$url"
70c7ac22
LH
456 then
457 # Only mention uninitialized submodules when its
458 # path have been specified
459 test "$#" != "0" &&
989206f5 460 say "Submodule path '$path' not initialized" &&
be4d2c83 461 say "Maybe you want to use 'update --init'?"
211b7f19
LH
462 continue
463 fi
464
ba88a1fe 465 if ! test -d "$path"/.git -o -f "$path"/.git
211b7f19 466 then
d92a3959 467 module_clone "$path" "$url" "$reference"|| exit
1b4735d9 468 cloned_modules="$cloned_modules;$name"
bf2d8246
LH
469 subsha1=
470 else
74ae1419 471 subsha1=$(clear_local_git_env; cd "$path" &&
5be60078 472 git rev-parse --verify HEAD) ||
941987a5 473 die "Unable to find current revision in submodule path '$path'"
70c7ac22 474 fi
211b7f19 475
32948425 476 if ! test -z "$update"
ca2cedba 477 then
32948425 478 update_module=$update
ca2cedba
PH
479 fi
480
70c7ac22
LH
481 if test "$subsha1" != "$sha1"
482 then
b9b378a0
PY
483 force=
484 if test -z "$subsha1"
485 then
486 force="-f"
487 fi
31ca3ac3
FF
488
489 if test -z "$nofetch"
490 then
74ae1419 491 (clear_local_git_env; cd "$path" &&
31ca3ac3
FF
492 git-fetch) ||
493 die "Unable to fetch in submodule path '$path'"
494 fi
495
1b4735d9
SO
496 # Is this something we just cloned?
497 case ";$cloned_modules;" in
498 *";$name;"*)
499 # then there is no local change to integrate
500 update_module= ;;
501 esac
502
32948425
JH
503 case "$update_module" in
504 rebase)
505 command="git rebase"
ca2cedba
PH
506 action="rebase"
507 msg="rebased onto"
32948425 508 ;;
42b49178
JH
509 merge)
510 command="git merge"
511 action="merge"
512 msg="merged in"
513 ;;
32948425
JH
514 *)
515 command="git checkout $force -q"
ca2cedba
PH
516 action="checkout"
517 msg="checked out"
32948425
JH
518 ;;
519 esac
70c7ac22 520
74ae1419 521 (clear_local_git_env; cd "$path" && $command "$sha1") ||
ca2cedba
PH
522 die "Unable to $action '$sha1' in submodule path '$path'"
523 say "Submodule path '$path': $msg '$sha1'"
70c7ac22 524 fi
b13fd5c1
JH
525
526 if test -n "$recursive"
527 then
98dbe63d 528 (clear_local_git_env; cd "$path" && eval cmd_update "$orig_flags") ||
b13fd5c1
JH
529 die "Failed to recurse into submodule path '$path'"
530 fi
70c7ac22
LH
531 done
532}
533
bffe71f4
EM
534set_name_rev () {
535 revname=$( (
74ae1419 536 clear_local_git_env
bffe71f4 537 cd "$1" && {
5be60078
JH
538 git describe "$2" 2>/dev/null ||
539 git describe --tags "$2" 2>/dev/null ||
f669ac0b
ML
540 git describe --contains "$2" 2>/dev/null ||
541 git describe --all --always "$2"
bffe71f4
EM
542 }
543 ) )
544 test -z "$revname" || revname=" ($revname)"
545}
28f9af5d
PY
546#
547# Show commit summary for submodules in index or working tree
548#
549# If '--cached' is given, show summary between index and given commit,
550# or between working tree and given commit
551#
552# $@ = [commit (default 'HEAD'),] requested paths (default all)
553#
554cmd_summary() {
f2dc06a3 555 summary_limit=-1
d0f64dd4 556 for_status=
1c244f6e 557 diff_cmd=diff-index
f2dc06a3 558
28f9af5d
PY
559 # parse $args after "submodule ... summary".
560 while test $# -ne 0
561 do
562 case "$1" in
563 --cached)
564 cached="$1"
565 ;;
1c244f6e
JL
566 --files)
567 files="$1"
568 ;;
d0f64dd4
PY
569 --for-status)
570 for_status="$1"
571 ;;
f2dc06a3
PY
572 -n|--summary-limit)
573 if summary_limit=$(($2 + 0)) 2>/dev/null && test "$summary_limit" = "$2"
574 then
575 :
576 else
577 usage
578 fi
579 shift
580 ;;
28f9af5d
PY
581 --)
582 shift
583 break
584 ;;
585 -*)
586 usage
587 ;;
588 *)
589 break
590 ;;
591 esac
592 shift
593 done
bffe71f4 594
f2dc06a3
PY
595 test $summary_limit = 0 && return
596
3deea89c 597 if rev=$(git rev-parse -q --verify --default HEAD ${1+"$1"})
28f9af5d
PY
598 then
599 head=$rev
caa9c3ca 600 test $# = 0 || shift
3deea89c
JH
601 elif test -z "$1" -o "$1" = "HEAD"
602 then
14e940d7
JH
603 # before the first commit: compare with an empty tree
604 head=$(git hash-object -w -t tree --stdin </dev/null)
2ea6c2c9 605 test -z "$1" || shift
28f9af5d 606 else
3deea89c 607 head="HEAD"
28f9af5d
PY
608 fi
609
1c244f6e
JL
610 if [ -n "$files" ]
611 then
612 test -n "$cached" &&
613 die "--cached cannot be used with --files"
614 diff_cmd=diff-files
615 head=
616 fi
617
28f9af5d
PY
618 cd_to_toplevel
619 # Get modified modules cared by user
18076502 620 modules=$(git $diff_cmd $cached --ignore-submodules=dirty --raw $head -- "$@" |
e1622bfc 621 sane_egrep '^:([0-7]* )?160000' |
28f9af5d
PY
622 while read mod_src mod_dst sha1_src sha1_dst status name
623 do
624 # Always show modules deleted or type-changed (blob<->module)
625 test $status = D -o $status = T && echo "$name" && continue
626 # Also show added or modified modules which are checked out
627 GIT_DIR="$name/.git" git-rev-parse --git-dir >/dev/null 2>&1 &&
628 echo "$name"
629 done
630 )
1cb639e6 631
d0f64dd4
PY
632 test -z "$modules" && return
633
18076502 634 git $diff_cmd $cached --ignore-submodules=dirty --raw $head -- $modules |
e1622bfc 635 sane_egrep '^:([0-7]* )?160000' |
1cb639e6
PY
636 cut -c2- |
637 while read mod_src mod_dst sha1_src sha1_dst status name
638 do
639 if test -z "$cached" &&
640 test $sha1_dst = 0000000000000000000000000000000000000000
641 then
642 case "$mod_dst" in
643 160000)
644 sha1_dst=$(GIT_DIR="$name/.git" git rev-parse HEAD)
645 ;;
646 100644 | 100755 | 120000)
647 sha1_dst=$(git hash-object $name)
648 ;;
649 000000)
650 ;; # removed
651 *)
652 # unexpected type
653 echo >&2 "unexpected mode $mod_dst"
654 continue ;;
655 esac
656 fi
657 missing_src=
658 missing_dst=
659
660 test $mod_src = 160000 &&
30353a40 661 ! GIT_DIR="$name/.git" git-rev-parse -q --verify $sha1_src^0 >/dev/null &&
1cb639e6
PY
662 missing_src=t
663
664 test $mod_dst = 160000 &&
30353a40 665 ! GIT_DIR="$name/.git" git-rev-parse -q --verify $sha1_dst^0 >/dev/null &&
1cb639e6 666 missing_dst=t
bffe71f4 667
1cb639e6
PY
668 total_commits=
669 case "$missing_src,$missing_dst" in
670 t,)
671 errmsg=" Warn: $name doesn't contain commit $sha1_src"
672 ;;
673 ,t)
674 errmsg=" Warn: $name doesn't contain commit $sha1_dst"
675 ;;
676 t,t)
677 errmsg=" Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
678 ;;
679 *)
680 errmsg=
681 total_commits=$(
682 if test $mod_src = 160000 -a $mod_dst = 160000
683 then
684 range="$sha1_src...$sha1_dst"
685 elif test $mod_src = 160000
686 then
687 range=$sha1_src
688 else
689 range=$sha1_dst
690 fi
691 GIT_DIR="$name/.git" \
b0e621ad 692 git rev-list --first-parent $range -- | wc -l
1cb639e6 693 )
eed35595 694 total_commits=" ($(($total_commits + 0)))"
1cb639e6
PY
695 ;;
696 esac
697
698 sha1_abbr_src=$(echo $sha1_src | cut -c1-7)
699 sha1_abbr_dst=$(echo $sha1_dst | cut -c1-7)
700 if test $status = T
701 then
702 if test $mod_dst = 160000
703 then
704 echo "* $name $sha1_abbr_src(blob)->$sha1_abbr_dst(submodule)$total_commits:"
705 else
706 echo "* $name $sha1_abbr_src(submodule)->$sha1_abbr_dst(blob)$total_commits:"
707 fi
708 else
709 echo "* $name $sha1_abbr_src...$sha1_abbr_dst$total_commits:"
710 fi
711 if test -n "$errmsg"
712 then
713 # Don't give error msg for modification whose dst is not submodule
714 # i.e. deleted or changed to blob
715 test $mod_dst = 160000 && echo "$errmsg"
716 else
717 if test $mod_src = 160000 -a $mod_dst = 160000
718 then
f2dc06a3
PY
719 limit=
720 test $summary_limit -gt 0 && limit="-$summary_limit"
1cb639e6 721 GIT_DIR="$name/.git" \
f2dc06a3 722 git log $limit --pretty='format: %m %s' \
1cb639e6
PY
723 --first-parent $sha1_src...$sha1_dst
724 elif test $mod_dst = 160000
725 then
726 GIT_DIR="$name/.git" \
727 git log --pretty='format: > %s' -1 $sha1_dst
728 else
729 GIT_DIR="$name/.git" \
730 git log --pretty='format: < %s' -1 $sha1_src
731 fi
732 echo
733 fi
734 echo
d0f64dd4
PY
735 done |
736 if test -n "$for_status"; then
f17a5d34
JL
737 if [ -n "$files" ]; then
738 echo "# Submodules changed but not updated:"
739 else
740 echo "# Submodule changes to be committed:"
741 fi
d0f64dd4
PY
742 echo "#"
743 sed -e 's|^|# |' -e 's|^# $|#|'
744 else
745 cat
746 fi
28f9af5d 747}
70c7ac22 748#
941987a5 749# List all submodules, prefixed with:
70c7ac22
LH
750# - submodule not initialized
751# + different revision checked out
752#
753# If --cached was specified the revision in the index will be printed
754# instead of the currently checked out revision.
755#
756# $@ = requested paths (default to all)
757#
23a485e3 758cmd_status()
70c7ac22 759{
5c08dbbd 760 # parse $args after "submodule ... status".
98dbe63d 761 orig_flags=
5c08dbbd
JH
762 while test $# -ne 0
763 do
764 case "$1" in
765 -q|--quiet)
2e6a30ef 766 GIT_QUIET=1
5c08dbbd
JH
767 ;;
768 --cached)
769 cached=1
770 ;;
64b19ffe
JH
771 --recursive)
772 recursive=1
773 ;;
5c08dbbd
JH
774 --)
775 shift
776 break
777 ;;
778 -*)
779 usage
780 ;;
781 *)
782 break
783 ;;
784 esac
98dbe63d 785 orig_flags="$orig_flags $(git rev-parse --sq-quote "$1")"
5c08dbbd
JH
786 shift
787 done
788
a7b3269c 789 module_list "$@" |
70c7ac22
LH
790 while read mode sha1 stage path
791 do
941987a5 792 name=$(module_name "$path") || exit
5be60078 793 url=$(git config submodule."$name".url)
64b19ffe 794 displaypath="$prefix$path"
313ee0d6
NMC
795 if test "$stage" = U
796 then
797 say "U$sha1 $displaypath"
798 continue
799 fi
ba88a1fe 800 if test -z "$url" || ! test -d "$path"/.git -o -f "$path"/.git
70c7ac22 801 then
64b19ffe 802 say "-$sha1 $displaypath"
70c7ac22
LH
803 continue;
804 fi
41c7c1bd 805 set_name_rev "$path" "$sha1"
18076502 806 if git diff-files --ignore-submodules=dirty --quiet -- "$path"
70c7ac22 807 then
64b19ffe 808 say " $sha1 $displaypath$revname"
70c7ac22
LH
809 else
810 if test -z "$cached"
811 then
74ae1419 812 sha1=$(clear_local_git_env; cd "$path" && git rev-parse --verify HEAD)
41c7c1bd 813 set_name_rev "$path" "$sha1"
70c7ac22 814 fi
64b19ffe
JH
815 say "+$sha1 $displaypath$revname"
816 fi
817
818 if test -n "$recursive"
819 then
820 (
821 prefix="$displaypath/"
74ae1419 822 clear_local_git_env
64b19ffe 823 cd "$path" &&
a7eff1a8 824 eval cmd_status "$orig_args"
64b19ffe
JH
825 ) ||
826 die "Failed to recurse into submodule path '$path'"
70c7ac22
LH
827 fi
828 done
829}
2327f61e
DA
830#
831# Sync remote urls for submodules
832# This makes the value for remote.$remote.url match the value
833# specified in .gitmodules.
834#
835cmd_sync()
836{
837 while test $# -ne 0
838 do
839 case "$1" in
840 -q|--quiet)
2e6a30ef 841 GIT_QUIET=1
2327f61e
DA
842 shift
843 ;;
844 --)
845 shift
846 break
847 ;;
848 -*)
849 usage
850 ;;
851 *)
852 break
853 ;;
854 esac
855 done
856 cd_to_toplevel
857 module_list "$@" |
858 while read mode sha1 stage path
859 do
860 name=$(module_name "$path")
861 url=$(git config -f .gitmodules --get submodule."$name".url)
baede9f8
JH
862
863 # Possibly a url relative to parent
864 case "$url" in
865 ./*|../*)
866 url=$(resolve_relative_url "$url") || exit
867 ;;
868 esac
869
33f072f8
AK
870 say "Synchronizing submodule url for '$name'"
871 git config submodule."$name".url "$url"
872
2327f61e
DA
873 if test -e "$path"/.git
874 then
875 (
74ae1419 876 clear_local_git_env
2327f61e
DA
877 cd "$path"
878 remote=$(get_default_remote)
2327f61e
DA
879 git config remote."$remote".url "$url"
880 )
881 fi
882 done
883}
70c7ac22 884
5c08dbbd
JH
885# This loop parses the command line arguments to find the
886# subcommand name to dispatch. Parsing of the subcommand specific
887# options are primarily done by the subcommand implementations.
888# Subcommand specific options such as --branch and --cached are
889# parsed here as well, for backward compatibility.
890
891while test $# != 0 && test -z "$command"
70c7ac22
LH
892do
893 case "$1" in
2327f61e 894 add | foreach | init | update | status | summary | sync)
5c08dbbd 895 command=$1
70c7ac22
LH
896 ;;
897 -q|--quiet)
2e6a30ef 898 GIT_QUIET=1
70c7ac22 899 ;;
ecda0723
SV
900 -b|--branch)
901 case "$2" in
902 '')
903 usage
904 ;;
905 esac
906 branch="$2"; shift
907 ;;
70c7ac22 908 --cached)
28f9af5d 909 cached="$1"
70c7ac22
LH
910 ;;
911 --)
912 break
913 ;;
914 -*)
915 usage
916 ;;
917 *)
918 break
919 ;;
920 esac
921 shift
922done
923
5c08dbbd
JH
924# No command word defaults to "status"
925test -n "$command" || command=status
926
927# "-b branch" is accepted only by "add"
928if test -n "$branch" && test "$command" != add
929then
ecda0723 930 usage
5c08dbbd
JH
931fi
932
28f9af5d
PY
933# "--cached" is accepted only by "status" and "summary"
934if test -n "$cached" && test "$command" != status -a "$command" != summary
5c08dbbd 935then
70c7ac22 936 usage
5c08dbbd
JH
937fi
938
939"cmd_$command" "$@"