blob: 3adab9363563e80e4ceb2c7fb5c3ab91ac1ef505 [file] [log] [blame]
Lars Hjemli70c7ac22007-05-26 15:56:40 +02001#!/bin/sh
2#
Sven Verdoolaegeecda0722007-06-24 23:06:07 +02003# git-submodules.sh: add, init, update or list git submodules
Lars Hjemli70c7ac22007-05-26 15:56:40 +02004#
5# Copyright (c) 2007 Lars Hjemli
6
Johan Herland1d5bec82009-08-19 03:45:19 +02007dashless=$(basename "$0" | sed -e 's/-/ /')
Jens Lehmannd27b8762010-07-17 17:11:43 +02008USAGE="[--quiet] add [-b branch] [-f|--force] [--reference <repository>] [--] <repository> [<path>]
Johan Herland64b19ff2009-08-19 03:45:24 +02009 or: $dashless [--quiet] status [--cached] [--recursive] [--] [<path>...]
Johan Herland1d5bec82009-08-19 03:45:19 +020010 or: $dashless [--quiet] init [--] [<path>...]
Nicolas Morey-Chaisemartin9db31bd2011-04-01 11:42:03 +020011 or: $dashless [--quiet] update [--init] [-N|--no-fetch] [-f|--force] [--rebase] [--reference <repository>] [--merge] [--recursive] [--] [<path>...]
Junio C Hamanoadc54232009-08-27 16:59:25 -070012 or: $dashless [--quiet] summary [--cached|--files] [--summary-limit <n>] [commit] [--] [<path>...]
Johan Herland15fc56a2009-08-19 03:45:22 +020013 or: $dashless [--quiet] foreach [--recursive] <command>
Johan Herland1d5bec82009-08-19 03:45:19 +020014 or: $dashless [--quiet] sync [--] [<path>...]"
Junio C Hamano8f321a32007-11-06 01:50:02 -080015OPTIONS_SPEC=
Lars Hjemli70c7ac22007-05-26 15:56:40 +020016. git-sh-setup
Ævar Arnfjörð Bjarmasond0ad8252011-05-21 18:43:58 +000017. git-sh-i18n
Mark Levedahl98fcf842008-08-24 14:46:10 -040018. git-parse-remote
Lars Hjemli70c7ac22007-05-26 15:56:40 +020019require_work_tree
20
Junio C Hamano5c08dbb2008-01-15 02:48:45 -080021command=
Sven Verdoolaegeecda0722007-06-24 23:06:07 +020022branch=
Jens Lehmannd27b8762010-07-17 17:11:43 +020023force=
Michael S. Tsirkind92a3952009-05-04 22:30:01 +030024reference=
Lars Hjemli70c7ac22007-05-26 15:56:40 +020025cached=
Gerrit Pape48bb3032010-04-26 11:50:39 +020026recursive=
27init=
Jens Lehmann1c244f62009-08-13 21:32:50 +020028files=
Fabian Franz31ca3ac2009-02-05 20:18:32 -020029nofetch=
Johan Herland32948422009-06-03 08:27:06 +020030update=
Johan Herland15fc56a2009-08-19 03:45:22 +020031prefix=
Lars Hjemli70c7ac22007-05-26 15:56:40 +020032
Mark Levedahlf31a5222007-09-23 22:19:42 -040033# Resolve relative url by appending to parent's url
34resolve_relative_url ()
35{
Mark Levedahl98fcf842008-08-24 14:46:10 -040036 remote=$(get_default_remote)
Mark Levedahl8e7e6f32008-06-14 13:09:41 -040037 remoteurl=$(git config "remote.$remote.url") ||
Jens Lehmann4d689322011-06-06 21:58:04 +020038 remoteurl=$(pwd) # the repository is its own authoritative upstream
Mark Levedahlf31a5222007-09-23 22:19:42 -040039 url="$1"
Mark Levedahl99b120a2008-08-21 19:54:01 -040040 remoteurl=${remoteurl%/}
Thomas Rastea640cc2011-01-10 11:37:26 +010041 sep=/
Mark Levedahlf31a5222007-09-23 22:19:42 -040042 while test -n "$url"
43 do
44 case "$url" in
45 ../*)
46 url="${url#../}"
Thomas Rastea640cc2011-01-10 11:37:26 +010047 case "$remoteurl" in
48 */*)
49 remoteurl="${remoteurl%/*}"
50 ;;
51 *:*)
52 remoteurl="${remoteurl%:*}"
53 sep=:
54 ;;
55 *)
Ævar Arnfjörð Bjarmason497ee872011-05-21 18:44:01 +000056 die "$(eval_gettext "cannot strip one component off url '\$remoteurl'")"
Thomas Rastea640cc2011-01-10 11:37:26 +010057 ;;
58 esac
Mark Levedahlf31a5222007-09-23 22:19:42 -040059 ;;
60 ./*)
61 url="${url#./}"
62 ;;
63 *)
64 break;;
65 esac
66 done
Thomas Rastea640cc2011-01-10 11:37:26 +010067 echo "$remoteurl$sep${url%/}"
Mark Levedahlf31a5222007-09-23 22:19:42 -040068}
69
Lars Hjemli941987a2007-06-11 21:12:24 +020070#
David Aguilara7b32692008-08-22 00:30:50 -070071# Get submodule info for registered submodules
72# $@ = path to limit submodule list
73#
74module_list()
75{
Nicolas Morey-Chaisemartin313ee0d2011-03-30 07:20:02 +020076 git ls-files --error-unmatch --stage -- "$@" |
77 perl -e '
78 my %unmerged = ();
79 my ($null_sha1) = ("0" x 40);
80 while (<STDIN>) {
81 chomp;
82 my ($mode, $sha1, $stage, $path) =
83 /^([0-7]+) ([0-9a-f]{40}) ([0-3])\t(.*)$/;
84 next unless $mode eq "160000";
85 if ($stage ne "0") {
86 if (!$unmerged{$path}++) {
87 print "$mode $null_sha1 U\t$path\n";
88 }
89 next;
90 }
91 print "$_\n";
92 }
93 '
David Aguilara7b32692008-08-22 00:30:50 -070094}
95
96#
Lars Hjemli941987a2007-06-11 21:12:24 +020097# Map submodule path to submodule name
98#
99# $1 = path
100#
101module_name()
102{
Junio C Hamano537601a2007-07-25 15:51:26 -0700103 # Do we have "submodule.<something>.path = $1" defined in .gitmodules file?
Chris Riddfe22e542008-06-11 14:09:19 +0100104 re=$(printf '%s\n' "$1" | sed -e 's/[].[^$\\*]/\\&/g')
Imran M Yousufa5099bb2008-05-15 13:42:58 +0600105 name=$( git config -f .gitmodules --get-regexp '^submodule\..*\.path$' |
Junio C Hamano537601a2007-07-25 15:51:26 -0700106 sed -n -e 's|^submodule\.\(.*\)\.path '"$re"'$|\1|p' )
Tay Ray Chuan1e422582011-10-21 21:49:35 +0800107 test -z "$name" &&
108 die "$(eval_gettext "No submodule mapping found in .gitmodules for path '\$path'")"
109 echo "$name"
Lars Hjemli941987a2007-06-11 21:12:24 +0200110}
Lars Hjemli33aa6ff2007-06-06 11:13:01 +0200111
112#
113# Clone a submodule
114#
Junio C Hamano23a485e2008-01-15 02:35:49 -0800115# Prior to calling, cmd_update checks that a possibly existing
Sven Verdoolaegeecda0722007-06-24 23:06:07 +0200116# path is not a git repository.
Junio C Hamano23a485e2008-01-15 02:35:49 -0800117# Likewise, cmd_add checks that path does not exist at all,
Sven Verdoolaegeecda0722007-06-24 23:06:07 +0200118# since it is the location of a new submodule.
119#
Lars Hjemli33aa6ff2007-06-06 11:13:01 +0200120module_clone()
121{
122 path=$1
123 url=$2
Michael S. Tsirkind92a3952009-05-04 22:30:01 +0300124 reference="$3"
Jens Lehmann7e604072011-07-26 23:39:03 +0200125 quiet=
126 if test -n "$GIT_QUIET"
127 then
128 quiet=-q
129 fi
Lars Hjemli33aa6ff2007-06-06 11:13:01 +0200130
Fredrik Gustafsson501770e2011-08-15 23:17:47 +0200131 gitdir=
132 gitdir_base=
Tay Ray Chuan9e76d4a2011-10-21 21:49:36 +0800133 name=$(module_name "$path" 2>/dev/null)
Fredrik Gustafsson501770e2011-08-15 23:17:47 +0200134 base_path=$(dirname "$path")
Lars Hjemli33aa6ff2007-06-06 11:13:01 +0200135
Fredrik Gustafsson501770e2011-08-15 23:17:47 +0200136 gitdir=$(git rev-parse --git-dir)
137 gitdir_base="$gitdir/modules/$base_path"
138 gitdir="$gitdir/modules/$path"
139
140 case $gitdir in
141 /*)
142 a="$(cd_to_toplevel && pwd)/"
143 b=$gitdir
144 while [ "$b" ] && [ "${a%%/*}" = "${b%%/*}" ]
145 do
146 a=${a#*/} b=${b#*/};
147 done
148
149 rel="$a$name"
150 rel=`echo $rel | sed -e 's|[^/]*|..|g'`
151 rel_gitdir="$rel/$b"
152 ;;
153 *)
154 rel=`echo $name | sed -e 's|[^/]*|..|g'`
155 rel_gitdir="$rel/$gitdir"
156 ;;
157 esac
158
159 if test -d "$gitdir"
Michael S. Tsirkind92a3952009-05-04 22:30:01 +0300160 then
Fredrik Gustafsson501770e2011-08-15 23:17:47 +0200161 mkdir -p "$path"
162 echo "gitdir: $rel_gitdir" >"$path/.git"
163 rm -f "$gitdir/index"
Michael S. Tsirkind92a3952009-05-04 22:30:01 +0300164 else
Fredrik Gustafsson501770e2011-08-15 23:17:47 +0200165 mkdir -p "$gitdir_base"
166 if test -n "$reference"
167 then
Junio C Hamanoefc5fb62011-10-10 15:56:16 -0700168 git-clone $quiet "$reference" -n "$url" "$path" --separate-git-dir "$gitdir"
Fredrik Gustafsson501770e2011-08-15 23:17:47 +0200169 else
Junio C Hamanoefc5fb62011-10-10 15:56:16 -0700170 git-clone $quiet -n "$url" "$path" --separate-git-dir "$gitdir"
Fredrik Gustafsson501770e2011-08-15 23:17:47 +0200171 fi ||
172 die "$(eval_gettext "Clone of '\$url' into submodule path '\$path' failed")"
173 fi
Lars Hjemli33aa6ff2007-06-06 11:13:01 +0200174}
175
Lars Hjemli70c7ac22007-05-26 15:56:40 +0200176#
Sven Verdoolaegeecda0722007-06-24 23:06:07 +0200177# Add a new submodule to the working tree, .gitmodules and the index
178#
Mark Levedahlec05df32008-07-09 21:05:40 -0400179# $@ = repo path
Sven Verdoolaegeecda0722007-06-24 23:06:07 +0200180#
181# optional branch is stored in global branch variable
182#
Junio C Hamano23a485e2008-01-15 02:35:49 -0800183cmd_add()
Sven Verdoolaegeecda0722007-06-24 23:06:07 +0200184{
Junio C Hamano5c08dbb2008-01-15 02:48:45 -0800185 # parse $args after "submodule ... add".
186 while test $# -ne 0
187 do
188 case "$1" in
189 -b | --branch)
190 case "$2" in '') usage ;; esac
191 branch=$2
192 shift
193 ;;
Jens Lehmannd27b8762010-07-17 17:11:43 +0200194 -f | --force)
195 force=$1
196 ;;
Junio C Hamano5c08dbb2008-01-15 02:48:45 -0800197 -q|--quiet)
Stephen Boyd2e6a30e2009-06-16 15:33:00 -0700198 GIT_QUIET=1
Junio C Hamano5c08dbb2008-01-15 02:48:45 -0800199 ;;
Michael S. Tsirkind92a3952009-05-04 22:30:01 +0300200 --reference)
201 case "$2" in '') usage ;; esac
202 reference="--reference=$2"
203 shift
204 ;;
205 --reference=*)
206 reference="$1"
207 shift
208 ;;
Junio C Hamano5c08dbb2008-01-15 02:48:45 -0800209 --)
210 shift
211 break
212 ;;
213 -*)
214 usage
215 ;;
216 *)
217 break
218 ;;
219 esac
220 shift
221 done
222
Sven Verdoolaegeecda0722007-06-24 23:06:07 +0200223 repo=$1
224 path=$2
225
Jens Lehmann1414e572009-09-22 17:10:12 +0200226 if test -z "$path"; then
227 path=$(echo "$repo" |
228 sed -e 's|/$||' -e 's|:*/*\.git$||' -e 's|.*[/:]||g')
229 fi
230
Mark Levedahlec05df32008-07-09 21:05:40 -0400231 if test -z "$repo" -o -z "$path"; then
Sven Verdoolaegeecda0722007-06-24 23:06:07 +0200232 usage
233 fi
234
Mark Levedahlec05df32008-07-09 21:05:40 -0400235 # assure repo is absolute or relative to parent
236 case "$repo" in
237 ./*|../*)
238 # dereference source url relative to parent's url
239 realrepo=$(resolve_relative_url "$repo") || exit
240 ;;
241 *:*|/*)
242 # absolute url
243 realrepo=$repo
244 ;;
245 *)
Ævar Arnfjörð Bjarmason497ee872011-05-21 18:44:01 +0000246 die "$(eval_gettext "repo URL: '\$repo' must be absolute or begin with ./|../")"
Mark Levedahlec05df32008-07-09 21:05:40 -0400247 ;;
248 esac
249
Michael J Gruberdb75ada2009-03-03 16:08:21 +0100250 # normalize path:
251 # multiple //; leading ./; /./; /../; trailing /
252 path=$(printf '%s/\n' "$path" |
253 sed -e '
254 s|//*|/|g
255 s|^\(\./\)*||
256 s|/\./|/|g
257 :start
258 s|\([^/]*\)/\.\./||
259 tstart
260 s|/*$||
261 ')
Junio C Hamano5be60072007-07-02 22:52:14 -0700262 git ls-files --error-unmatch "$path" > /dev/null 2>&1 &&
Ævar Arnfjörð Bjarmason497ee872011-05-21 18:44:01 +0000263 die "$(eval_gettext "'\$path' already exists in the index")"
Sven Verdoolaegeecda0722007-06-24 23:06:07 +0200264
Jens Lehmannd27b8762010-07-17 17:11:43 +0200265 if test -z "$force" && ! git add --dry-run --ignore-missing "$path" > /dev/null 2>&1
266 then
Jon Seymour6ff875c2011-08-07 21:58:17 +1000267 eval_gettextln "The following path is ignored by one of your .gitignore files:
Ævar Arnfjörð Bjarmason3a4c3ed2011-05-21 18:44:07 +0000268\$path
Jon Seymour6ff875c2011-08-07 21:58:17 +1000269Use -f if you really want to add it." >&2
Jens Lehmannd27b8762010-07-17 17:11:43 +0200270 exit 1
271 fi
272
Mark Levedahld4264ca2008-03-04 20:15:02 -0500273 # perhaps the path exists and is already a git repo, else clone it
274 if test -e "$path"
275 then
Mark Levedahle9656472008-07-07 22:36:40 -0400276 if test -d "$path"/.git -o -f "$path"/.git
Mark Levedahld4264ca2008-03-04 20:15:02 -0500277 then
Jon Seymour6ff875c2011-08-07 21:58:17 +1000278 eval_gettextln "Adding existing repo at '\$path' to the index"
Mark Levedahld4264ca2008-03-04 20:15:02 -0500279 else
Ævar Arnfjörð Bjarmason497ee872011-05-21 18:44:01 +0000280 die "$(eval_gettext "'\$path' already exists and is not a valid git repo")"
Mark Levedahld4264ca2008-03-04 20:15:02 -0500281 fi
Mark Levedahlc2f93912008-07-09 21:05:41 -0400282
Mark Levedahld4264ca2008-03-04 20:15:02 -0500283 else
Mark Levedahld4264ca2008-03-04 20:15:02 -0500284
Michael S. Tsirkind92a3952009-05-04 22:30:01 +0300285 module_clone "$path" "$realrepo" "$reference" || exit
Ben Jacksonea10b602009-04-18 20:42:07 -0700286 (
Giuseppe Bilotta74ae1412010-02-25 00:34:17 +0100287 clear_local_git_env
Ben Jacksonea10b602009-04-18 20:42:07 -0700288 cd "$path" &&
289 # ash fails to wordsplit ${branch:+-b "$branch"...}
290 case "$branch" in
291 '') git checkout -f -q ;;
Jonathan Nieder502dc5b2010-12-01 12:50:46 -0600292 ?*) git checkout -f -q -B "$branch" "origin/$branch" ;;
Ben Jacksonea10b602009-04-18 20:42:07 -0700293 esac
Ævar Arnfjörð Bjarmason497ee872011-05-21 18:44:01 +0000294 ) || die "$(eval_gettext "Unable to checkout submodule '\$path'")"
Mark Levedahld4264ca2008-03-04 20:15:02 -0500295 fi
Junio C Hamanoc56dce32011-07-22 14:24:35 -0700296 git config submodule."$path".url "$realrepo"
Mark Levedahld4264ca2008-03-04 20:15:02 -0500297
Jens Lehmannd27b8762010-07-17 17:11:43 +0200298 git add $force "$path" ||
Ævar Arnfjörð Bjarmason497ee872011-05-21 18:44:01 +0000299 die "$(eval_gettext "Failed to add submodule '\$path'")"
Sven Verdoolaegeecda0722007-06-24 23:06:07 +0200300
Imran M Yousufa5099bb2008-05-15 13:42:58 +0600301 git config -f .gitmodules submodule."$path".path "$path" &&
302 git config -f .gitmodules submodule."$path".url "$repo" &&
Ævar Arnfjörð Bjarmason31991b02010-07-05 17:33:03 +0000303 git add --force .gitmodules ||
Ævar Arnfjörð Bjarmason497ee872011-05-21 18:44:01 +0000304 die "$(eval_gettext "Failed to register submodule '\$path'")"
Sven Verdoolaegeecda0722007-06-24 23:06:07 +0200305}
306
307#
Mark Levedahl19a31f92008-08-10 19:10:04 -0400308# Execute an arbitrary command sequence in each checked out
309# submodule
310#
311# $@ = command to execute
312#
313cmd_foreach()
314{
Johan Herland1d5bec82009-08-19 03:45:19 +0200315 # parse $args after "submodule ... foreach".
316 while test $# -ne 0
317 do
318 case "$1" in
319 -q|--quiet)
320 GIT_QUIET=1
321 ;;
Johan Herland15fc56a2009-08-19 03:45:22 +0200322 --recursive)
323 recursive=1
324 ;;
Johan Herland1d5bec82009-08-19 03:45:19 +0200325 -*)
326 usage
327 ;;
328 *)
329 break
330 ;;
331 esac
332 shift
333 done
334
Ævar Arnfjörð Bjarmasonf030c962010-05-21 16:10:10 +0000335 toplevel=$(pwd)
336
Brandon Casey4dca1aa2011-06-29 19:34:58 -0500337 # dup stdin so that it can be restored when running the external
338 # command in the subshell (and a recursive call to this function)
339 exec 3<&0
340
David Aguilara7b32692008-08-22 00:30:50 -0700341 module_list |
Mark Levedahl19a31f92008-08-10 19:10:04 -0400342 while read mode sha1 stage path
343 do
344 if test -e "$path"/.git
345 then
Ævar Arnfjörð Bjarmason490b6d52011-05-21 18:44:06 +0000346 say "$(eval_gettext "Entering '\$prefix\$path'")"
Johan Herland1e7f2aa2009-08-16 03:10:08 +0200347 name=$(module_name "$path")
Johan Herland15fc56a2009-08-19 03:45:22 +0200348 (
349 prefix="$prefix$path/"
Giuseppe Bilotta74ae1412010-02-25 00:34:17 +0100350 clear_local_git_env
Johan Herland15fc56a2009-08-19 03:45:22 +0200351 cd "$path" &&
352 eval "$@" &&
353 if test -n "$recursive"
354 then
355 cmd_foreach "--recursive" "$@"
356 fi
Brandon Casey4dca1aa2011-06-29 19:34:58 -0500357 ) <&3 3<&- ||
Ævar Arnfjörð Bjarmason497ee872011-05-21 18:44:01 +0000358 die "$(eval_gettext "Stopping at '\$path'; script returned non-zero status.")"
Mark Levedahl19a31f92008-08-10 19:10:04 -0400359 fi
360 done
361}
362
363#
Lars Hjemli211b7f12007-06-06 11:13:02 +0200364# Register submodules in .git/config
Lars Hjemli70c7ac22007-05-26 15:56:40 +0200365#
366# $@ = requested paths (default to all)
367#
Junio C Hamano23a485e2008-01-15 02:35:49 -0800368cmd_init()
Lars Hjemli70c7ac22007-05-26 15:56:40 +0200369{
Junio C Hamano5c08dbb2008-01-15 02:48:45 -0800370 # parse $args after "submodule ... init".
371 while test $# -ne 0
372 do
373 case "$1" in
374 -q|--quiet)
Stephen Boyd2e6a30e2009-06-16 15:33:00 -0700375 GIT_QUIET=1
Junio C Hamano5c08dbb2008-01-15 02:48:45 -0800376 ;;
377 --)
378 shift
379 break
380 ;;
381 -*)
382 usage
383 ;;
384 *)
385 break
386 ;;
387 esac
388 shift
389 done
390
David Aguilara7b32692008-08-22 00:30:50 -0700391 module_list "$@" |
Lars Hjemli70c7ac22007-05-26 15:56:40 +0200392 while read mode sha1 stage path
393 do
Lars Hjemli211b7f12007-06-06 11:13:02 +0200394 # Skip already registered paths
Lars Hjemli941987a2007-06-11 21:12:24 +0200395 name=$(module_name "$path") || exit
Jens Lehmann2cd9de32011-06-26 01:26:02 +0200396 if test -z "$(git config "submodule.$name.url")"
397 then
398 url=$(git config -f .gitmodules submodule."$name".url)
399 test -z "$url" &&
Junio C Hamano0591c0a2011-07-19 09:45:37 -0700400 die "$(eval_gettext "No url found for submodule path '\$path' in .gitmodules")"
Lars Hjemli70c7ac22007-05-26 15:56:40 +0200401
Jens Lehmann2cd9de32011-06-26 01:26:02 +0200402 # Possibly a url relative to parent
403 case "$url" in
404 ./*|../*)
405 url=$(resolve_relative_url "$url") || exit
406 ;;
407 esac
408 git config submodule."$name".url "$url" ||
Junio C Hamano0591c0a2011-07-19 09:45:37 -0700409 die "$(eval_gettext "Failed to register url for submodule path '\$path'")"
Jens Lehmann2cd9de32011-06-26 01:26:02 +0200410 fi
Lars Hjemli70c7ac22007-05-26 15:56:40 +0200411
Jens Lehmann2cd9de32011-06-26 01:26:02 +0200412 # Copy "update" setting when it is not set yet
Johan Herland32948422009-06-03 08:27:06 +0200413 upd="$(git config -f .gitmodules submodule."$name".update)"
414 test -z "$upd" ||
Jens Lehmann2cd9de32011-06-26 01:26:02 +0200415 test -n "$(git config submodule."$name".update)" ||
Johan Herland32948422009-06-03 08:27:06 +0200416 git config submodule."$name".update "$upd" ||
Ævar Arnfjörð Bjarmason497ee872011-05-21 18:44:01 +0000417 die "$(eval_gettext "Failed to register update mode for submodule path '\$path'")"
Peter Huttererca2cedb2009-04-24 09:06:38 +1000418
Ævar Arnfjörð Bjarmason497ee872011-05-21 18:44:01 +0000419 say "$(eval_gettext "Submodule '\$name' (\$url) registered for path '\$path'")"
Lars Hjemli70c7ac22007-05-26 15:56:40 +0200420 done
421}
422
423#
Lars Hjemli211b7f12007-06-06 11:13:02 +0200424# Update each submodule path to correct revision, using clone and checkout as needed
Lars Hjemli70c7ac22007-05-26 15:56:40 +0200425#
426# $@ = requested paths (default to all)
427#
Junio C Hamano23a485e2008-01-15 02:35:49 -0800428cmd_update()
Lars Hjemli70c7ac22007-05-26 15:56:40 +0200429{
Junio C Hamano5c08dbb2008-01-15 02:48:45 -0800430 # parse $args after "submodule ... update".
Kevin Ballard98dbe632010-11-02 23:26:25 -0700431 orig_flags=
Junio C Hamano5c08dbb2008-01-15 02:48:45 -0800432 while test $# -ne 0
433 do
434 case "$1" in
435 -q|--quiet)
Stephen Boyd2e6a30e2009-06-16 15:33:00 -0700436 GIT_QUIET=1
Junio C Hamano5c08dbb2008-01-15 02:48:45 -0800437 ;;
Johannes Schindelinbe4d2c82008-05-16 11:23:03 +0100438 -i|--init)
Michael S. Tsirkind92a3952009-05-04 22:30:01 +0300439 init=1
Johannes Schindelinbe4d2c82008-05-16 11:23:03 +0100440 ;;
Fabian Franz31ca3ac2009-02-05 20:18:32 -0200441 -N|--no-fetch)
Fabian Franz31ca3ac2009-02-05 20:18:32 -0200442 nofetch=1
443 ;;
Nicolas Morey-Chaisemartin9db31bd2011-04-01 11:42:03 +0200444 -f|--force)
445 force=$1
446 ;;
Peter Huttererca2cedb2009-04-24 09:06:38 +1000447 -r|--rebase)
Johan Herland32948422009-06-03 08:27:06 +0200448 update="rebase"
Peter Huttererca2cedb2009-04-24 09:06:38 +1000449 ;;
Michael S. Tsirkind92a3952009-05-04 22:30:01 +0300450 --reference)
451 case "$2" in '') usage ;; esac
452 reference="--reference=$2"
Kevin Ballard98dbe632010-11-02 23:26:25 -0700453 orig_flags="$orig_flags $(git rev-parse --sq-quote "$1")"
454 shift
Michael S. Tsirkind92a3952009-05-04 22:30:01 +0300455 ;;
456 --reference=*)
457 reference="$1"
Michael S. Tsirkind92a3952009-05-04 22:30:01 +0300458 ;;
Johan Herland42b49172009-06-03 00:59:12 +0200459 -m|--merge)
Johan Herland42b49172009-06-03 00:59:12 +0200460 update="merge"
461 ;;
Johan Herlandb13fd5c2009-08-19 03:45:23 +0200462 --recursive)
Johan Herlandb13fd5c2009-08-19 03:45:23 +0200463 recursive=1
464 ;;
Junio C Hamanoefc5fb62011-10-10 15:56:16 -0700465 --checkout)
466 update="checkout"
467 ;;
Junio C Hamano5c08dbb2008-01-15 02:48:45 -0800468 --)
469 shift
470 break
471 ;;
472 -*)
473 usage
474 ;;
475 *)
476 break
477 ;;
478 esac
Kevin Ballard98dbe632010-11-02 23:26:25 -0700479 orig_flags="$orig_flags $(git rev-parse --sq-quote "$1")"
480 shift
Junio C Hamano5c08dbb2008-01-15 02:48:45 -0800481 done
482
Michael S. Tsirkind92a3952009-05-04 22:30:01 +0300483 if test -n "$init"
484 then
485 cmd_init "--" "$@" || return
486 fi
487
Spencer E. Olson1b4735d2011-02-17 09:18:45 -0700488 cloned_modules=
Fredrik Gustafsson15ffb7c2011-06-13 19:15:26 +0200489 module_list "$@" | {
490 err=
Lars Hjemli70c7ac22007-05-26 15:56:40 +0200491 while read mode sha1 stage path
492 do
Nicolas Morey-Chaisemartin313ee0d2011-03-30 07:20:02 +0200493 if test "$stage" = U
494 then
495 echo >&2 "Skipping unmerged submodule $path"
496 continue
497 fi
Lars Hjemli941987a2007-06-11 21:12:24 +0200498 name=$(module_name "$path") || exit
Junio C Hamano5be60072007-07-02 22:52:14 -0700499 url=$(git config submodule."$name".url)
Junio C Hamanoefc5fb62011-10-10 15:56:16 -0700500 if ! test -z "$update"
501 then
502 update_module=$update
503 else
504 update_module=$(git config submodule."$name".update)
505 fi
506
507 if test "$update_module" = "none"
508 then
509 echo "Skipping submodule '$path'"
510 continue
511 fi
512
Lars Hjemli211b7f12007-06-06 11:13:02 +0200513 if test -z "$url"
Lars Hjemli70c7ac22007-05-26 15:56:40 +0200514 then
515 # Only mention uninitialized submodules when its
516 # path have been specified
517 test "$#" != "0" &&
Ævar Arnfjörð Bjarmason1c2ef662011-05-21 18:44:08 +0000518 say "$(eval_gettext "Submodule path '\$path' not initialized
519Maybe you want to use 'update --init'?")"
Lars Hjemli211b7f12007-06-06 11:13:02 +0200520 continue
Lars Hjemli70c7ac22007-05-26 15:56:40 +0200521 fi
Lars Hjemli211b7f12007-06-06 11:13:02 +0200522
Lars Hjemliba88a1f2008-02-20 23:13:15 +0100523 if ! test -d "$path"/.git -o -f "$path"/.git
Lars Hjemli211b7f12007-06-06 11:13:02 +0200524 then
Michael S. Tsirkind92a3952009-05-04 22:30:01 +0300525 module_clone "$path" "$url" "$reference"|| exit
Spencer E. Olson1b4735d2011-02-17 09:18:45 -0700526 cloned_modules="$cloned_modules;$name"
Lars Hjemlibf2d8242007-06-11 21:12:22 +0200527 subsha1=
528 else
Giuseppe Bilotta74ae1412010-02-25 00:34:17 +0100529 subsha1=$(clear_local_git_env; cd "$path" &&
Junio C Hamano5be60072007-07-02 22:52:14 -0700530 git rev-parse --verify HEAD) ||
Ævar Arnfjörð Bjarmason497ee872011-05-21 18:44:01 +0000531 die "$(eval_gettext "Unable to find current revision in submodule path '\$path'")"
Lars Hjemli211b7f12007-06-06 11:13:02 +0200532 fi
533
Lars Hjemli70c7ac22007-05-26 15:56:40 +0200534 if test "$subsha1" != "$sha1"
535 then
Nicolas Morey-Chaisemartin9db31bd2011-04-01 11:42:03 +0200536 subforce=$force
537 # If we don't already have a -f flag and the submodule has never been checked out
538 if test -z "$subsha1" -a -z "$force"
Ping Yinb9b378a2008-09-26 23:33:23 +0800539 then
Nicolas Morey-Chaisemartin9db31bd2011-04-01 11:42:03 +0200540 subforce="-f"
Ping Yinb9b378a2008-09-26 23:33:23 +0800541 fi
Fabian Franz31ca3ac2009-02-05 20:18:32 -0200542
543 if test -z "$nofetch"
544 then
Jens Lehmanne5f522d2011-03-06 23:13:36 +0100545 # Run fetch only if $sha1 isn't present or it
546 # is not reachable from a ref.
Giuseppe Bilotta74ae1412010-02-25 00:34:17 +0100547 (clear_local_git_env; cd "$path" &&
Brandon Caseyf5799e02011-05-26 13:52:04 -0700548 ( (rev=$(git rev-list -n 1 $sha1 --not --all 2>/dev/null) &&
Jens Lehmanne5f522d2011-03-06 23:13:36 +0100549 test -z "$rev") || git-fetch)) ||
Ævar Arnfjörð Bjarmason497ee872011-05-21 18:44:01 +0000550 die "$(eval_gettext "Unable to fetch in submodule path '\$path'")"
Fabian Franz31ca3ac2009-02-05 20:18:32 -0200551 fi
552
Spencer E. Olson1b4735d2011-02-17 09:18:45 -0700553 # Is this something we just cloned?
554 case ";$cloned_modules;" in
555 *";$name;"*)
556 # then there is no local change to integrate
557 update_module= ;;
558 esac
559
Junio C Hamano877449c2011-06-13 12:17:52 -0700560 must_die_on_failure=
Johan Herland32948422009-06-03 08:27:06 +0200561 case "$update_module" in
562 rebase)
563 command="git rebase"
Ævar Arnfjörð Bjarmasonee653c82011-05-21 18:44:02 +0000564 die_msg="$(eval_gettext "Unable to rebase '\$sha1' in submodule path '\$path'")"
565 say_msg="$(eval_gettext "Submodule path '\$path': rebased into '\$sha1'")"
Junio C Hamano877449c2011-06-13 12:17:52 -0700566 must_die_on_failure=yes
Johan Herland32948422009-06-03 08:27:06 +0200567 ;;
Johan Herland42b49172009-06-03 00:59:12 +0200568 merge)
569 command="git merge"
Ævar Arnfjörð Bjarmasonee653c82011-05-21 18:44:02 +0000570 die_msg="$(eval_gettext "Unable to merge '\$sha1' in submodule path '\$path'")"
571 say_msg="$(eval_gettext "Submodule path '\$path': merged in '\$sha1'")"
Junio C Hamano877449c2011-06-13 12:17:52 -0700572 must_die_on_failure=yes
Johan Herland42b49172009-06-03 00:59:12 +0200573 ;;
Johan Herland32948422009-06-03 08:27:06 +0200574 *)
Nicolas Morey-Chaisemartin9db31bd2011-04-01 11:42:03 +0200575 command="git checkout $subforce -q"
Ævar Arnfjörð Bjarmasonee653c82011-05-21 18:44:02 +0000576 die_msg="$(eval_gettext "Unable to checkout '\$sha1' in submodule path '\$path'")"
577 say_msg="$(eval_gettext "Submodule path '\$path': checked out '\$sha1'")"
Johan Herland32948422009-06-03 08:27:06 +0200578 ;;
579 esac
Lars Hjemli70c7ac22007-05-26 15:56:40 +0200580
Fredrik Gustafsson15ffb7c2011-06-13 19:15:26 +0200581 if (clear_local_git_env; cd "$path" && $command "$sha1")
582 then
Junio C Hamanoff968f02011-07-13 14:31:35 -0700583 say "$say_msg"
Junio C Hamano877449c2011-06-13 12:17:52 -0700584 elif test -n "$must_die_on_failure"
585 then
Junio C Hamanoff968f02011-07-13 14:31:35 -0700586 die_with_status 2 "$die_msg"
Fredrik Gustafsson15ffb7c2011-06-13 19:15:26 +0200587 else
Junio C Hamanoff968f02011-07-13 14:31:35 -0700588 err="${err};$die_msg"
Junio C Hamano877449c2011-06-13 12:17:52 -0700589 continue
Fredrik Gustafsson15ffb7c2011-06-13 19:15:26 +0200590 fi
Lars Hjemli70c7ac22007-05-26 15:56:40 +0200591 fi
Johan Herlandb13fd5c2009-08-19 03:45:23 +0200592
593 if test -n "$recursive"
594 then
Fredrik Gustafsson15ffb7c2011-06-13 19:15:26 +0200595 (clear_local_git_env; cd "$path" && eval cmd_update "$orig_flags")
596 res=$?
597 if test $res -gt 0
598 then
Junio C Hamanoff968f02011-07-13 14:31:35 -0700599 die_msg="$(eval_gettext "Failed to recurse into submodule path '\$path'")"
Fredrik Gustafsson15ffb7c2011-06-13 19:15:26 +0200600 if test $res -eq 1
601 then
Junio C Hamanoff968f02011-07-13 14:31:35 -0700602 err="${err};$die_msg"
Fredrik Gustafsson15ffb7c2011-06-13 19:15:26 +0200603 continue
604 else
Junio C Hamanoff968f02011-07-13 14:31:35 -0700605 die_with_status $res "$die_msg"
Fredrik Gustafsson15ffb7c2011-06-13 19:15:26 +0200606 fi
607 fi
Johan Herlandb13fd5c2009-08-19 03:45:23 +0200608 fi
Lars Hjemli70c7ac22007-05-26 15:56:40 +0200609 done
Fredrik Gustafsson15ffb7c2011-06-13 19:15:26 +0200610
611 if test -n "$err"
612 then
613 OIFS=$IFS
614 IFS=';'
615 for e in $err
616 do
617 if test -n "$e"
618 then
619 echo >&2 "$e"
620 fi
621 done
622 IFS=$OIFS
623 exit 1
624 fi
625 }
Lars Hjemli70c7ac22007-05-26 15:56:40 +0200626}
627
Emil Medvebffe71f2007-06-26 18:40:58 -0500628set_name_rev () {
629 revname=$( (
Giuseppe Bilotta74ae1412010-02-25 00:34:17 +0100630 clear_local_git_env
Emil Medvebffe71f2007-06-26 18:40:58 -0500631 cd "$1" && {
Junio C Hamano5be60072007-07-02 22:52:14 -0700632 git describe "$2" 2>/dev/null ||
633 git describe --tags "$2" 2>/dev/null ||
Mark Levedahlf669ac02008-04-14 22:48:06 -0400634 git describe --contains "$2" 2>/dev/null ||
635 git describe --all --always "$2"
Emil Medvebffe71f2007-06-26 18:40:58 -0500636 }
637 ) )
638 test -z "$revname" || revname=" ($revname)"
639}
Ping Yin28f9af52008-03-11 21:52:15 +0800640#
641# Show commit summary for submodules in index or working tree
642#
643# If '--cached' is given, show summary between index and given commit,
644# or between working tree and given commit
645#
646# $@ = [commit (default 'HEAD'),] requested paths (default all)
647#
648cmd_summary() {
Ping Yinf2dc06a2008-03-11 21:52:17 +0800649 summary_limit=-1
Ping Yind0f64dd2008-04-12 23:05:31 +0800650 for_status=
Jens Lehmann1c244f62009-08-13 21:32:50 +0200651 diff_cmd=diff-index
Emil Medvebffe71f2007-06-26 18:40:58 -0500652
Ping Yin28f9af52008-03-11 21:52:15 +0800653 # parse $args after "submodule ... summary".
654 while test $# -ne 0
655 do
656 case "$1" in
657 --cached)
658 cached="$1"
659 ;;
Jens Lehmann1c244f62009-08-13 21:32:50 +0200660 --files)
661 files="$1"
662 ;;
Ping Yind0f64dd2008-04-12 23:05:31 +0800663 --for-status)
664 for_status="$1"
665 ;;
Ping Yinf2dc06a2008-03-11 21:52:17 +0800666 -n|--summary-limit)
667 if summary_limit=$(($2 + 0)) 2>/dev/null && test "$summary_limit" = "$2"
668 then
669 :
670 else
671 usage
672 fi
673 shift
674 ;;
Ping Yin28f9af52008-03-11 21:52:15 +0800675 --)
676 shift
677 break
678 ;;
679 -*)
680 usage
681 ;;
682 *)
683 break
684 ;;
685 esac
686 shift
687 done
Lars Hjemli70c7ac22007-05-26 15:56:40 +0200688
Ping Yinf2dc06a2008-03-11 21:52:17 +0800689 test $summary_limit = 0 && return
690
Johan Herland3deea892010-02-16 11:21:14 +0100691 if rev=$(git rev-parse -q --verify --default HEAD ${1+"$1"})
Ping Yin28f9af52008-03-11 21:52:15 +0800692 then
693 head=$rev
Jeff Kingcaa9c3c2010-03-03 14:19:09 -0800694 test $# = 0 || shift
Johan Herland3deea892010-02-16 11:21:14 +0100695 elif test -z "$1" -o "$1" = "HEAD"
696 then
Junio C Hamano14e940d2010-03-03 14:19:10 -0800697 # before the first commit: compare with an empty tree
698 head=$(git hash-object -w -t tree --stdin </dev/null)
Jens Lehmann2ea6c2c2010-03-09 15:55:32 +0100699 test -z "$1" || shift
Ping Yin28f9af52008-03-11 21:52:15 +0800700 else
Johan Herland3deea892010-02-16 11:21:14 +0100701 head="HEAD"
Ping Yin28f9af52008-03-11 21:52:15 +0800702 fi
703
Jens Lehmann1c244f62009-08-13 21:32:50 +0200704 if [ -n "$files" ]
705 then
706 test -n "$cached" &&
Ævar Arnfjörð Bjarmasonb9b9c222011-05-21 18:44:03 +0000707 die "$(gettext -- "--cached cannot be used with --files")"
Jens Lehmann1c244f62009-08-13 21:32:50 +0200708 diff_cmd=diff-files
709 head=
710 fi
711
Ping Yin28f9af52008-03-11 21:52:15 +0800712 cd_to_toplevel
713 # Get modified modules cared by user
Jens Lehmann18076502010-06-25 16:56:02 +0200714 modules=$(git $diff_cmd $cached --ignore-submodules=dirty --raw $head -- "$@" |
Junio C Hamanoe1622bf2009-11-23 15:56:32 -0800715 sane_egrep '^:([0-7]* )?160000' |
Ping Yin28f9af52008-03-11 21:52:15 +0800716 while read mod_src mod_dst sha1_src sha1_dst status name
717 do
718 # Always show modules deleted or type-changed (blob<->module)
719 test $status = D -o $status = T && echo "$name" && continue
720 # Also show added or modified modules which are checked out
721 GIT_DIR="$name/.git" git-rev-parse --git-dir >/dev/null 2>&1 &&
722 echo "$name"
723 done
724 )
Ping Yin1cb639e2008-03-11 21:52:16 +0800725
Ping Yind0f64dd2008-04-12 23:05:31 +0800726 test -z "$modules" && return
727
Jens Lehmann18076502010-06-25 16:56:02 +0200728 git $diff_cmd $cached --ignore-submodules=dirty --raw $head -- $modules |
Junio C Hamanoe1622bf2009-11-23 15:56:32 -0800729 sane_egrep '^:([0-7]* )?160000' |
Ping Yin1cb639e2008-03-11 21:52:16 +0800730 cut -c2- |
731 while read mod_src mod_dst sha1_src sha1_dst status name
732 do
733 if test -z "$cached" &&
734 test $sha1_dst = 0000000000000000000000000000000000000000
735 then
736 case "$mod_dst" in
737 160000)
738 sha1_dst=$(GIT_DIR="$name/.git" git rev-parse HEAD)
739 ;;
740 100644 | 100755 | 120000)
741 sha1_dst=$(git hash-object $name)
742 ;;
743 000000)
744 ;; # removed
745 *)
746 # unexpected type
Jon Seymour6ff875c2011-08-07 21:58:17 +1000747 eval_gettextln "unexpected mode \$mod_dst" >&2
Ping Yin1cb639e2008-03-11 21:52:16 +0800748 continue ;;
749 esac
750 fi
751 missing_src=
752 missing_dst=
753
754 test $mod_src = 160000 &&
Miklos Vajna30353a42008-12-03 14:26:52 +0100755 ! GIT_DIR="$name/.git" git-rev-parse -q --verify $sha1_src^0 >/dev/null &&
Ping Yin1cb639e2008-03-11 21:52:16 +0800756 missing_src=t
757
758 test $mod_dst = 160000 &&
Miklos Vajna30353a42008-12-03 14:26:52 +0100759 ! GIT_DIR="$name/.git" git-rev-parse -q --verify $sha1_dst^0 >/dev/null &&
Ping Yin1cb639e2008-03-11 21:52:16 +0800760 missing_dst=t
761
762 total_commits=
763 case "$missing_src,$missing_dst" in
764 t,)
Ævar Arnfjörð Bjarmasonf62f8212011-05-21 18:44:05 +0000765 errmsg="$(eval_gettext " Warn: \$name doesn't contain commit \$sha1_src")"
Ping Yin1cb639e2008-03-11 21:52:16 +0800766 ;;
767 ,t)
Ævar Arnfjörð Bjarmasonf62f8212011-05-21 18:44:05 +0000768 errmsg="$(eval_gettext " Warn: \$name doesn't contain commit \$sha1_dst")"
Ping Yin1cb639e2008-03-11 21:52:16 +0800769 ;;
770 t,t)
Ævar Arnfjörð Bjarmasonf62f8212011-05-21 18:44:05 +0000771 errmsg="$(eval_gettext " Warn: \$name doesn't contain commits \$sha1_src and \$sha1_dst")"
Ping Yin1cb639e2008-03-11 21:52:16 +0800772 ;;
773 *)
774 errmsg=
775 total_commits=$(
776 if test $mod_src = 160000 -a $mod_dst = 160000
777 then
778 range="$sha1_src...$sha1_dst"
779 elif test $mod_src = 160000
780 then
781 range=$sha1_src
782 else
783 range=$sha1_dst
784 fi
785 GIT_DIR="$name/.git" \
Jeff Kingb0e621a2010-04-08 15:42:37 -0400786 git rev-list --first-parent $range -- | wc -l
Ping Yin1cb639e2008-03-11 21:52:16 +0800787 )
Johannes Sixteed35592008-03-12 09:30:01 +0100788 total_commits=" ($(($total_commits + 0)))"
Ping Yin1cb639e2008-03-11 21:52:16 +0800789 ;;
790 esac
791
792 sha1_abbr_src=$(echo $sha1_src | cut -c1-7)
793 sha1_abbr_dst=$(echo $sha1_dst | cut -c1-7)
794 if test $status = T
795 then
Ævar Arnfjörð Bjarmasonb3e73442011-05-21 18:44:09 +0000796 blob="$(gettext "blob")"
797 submodule="$(gettext "submodule")"
Ping Yin1cb639e2008-03-11 21:52:16 +0800798 if test $mod_dst = 160000
799 then
Ævar Arnfjörð Bjarmasonb3e73442011-05-21 18:44:09 +0000800 echo "* $name $sha1_abbr_src($blob)->$sha1_abbr_dst($submodule)$total_commits:"
Ping Yin1cb639e2008-03-11 21:52:16 +0800801 else
Ævar Arnfjörð Bjarmasonb3e73442011-05-21 18:44:09 +0000802 echo "* $name $sha1_abbr_src($submodule)->$sha1_abbr_dst($blob)$total_commits:"
Ping Yin1cb639e2008-03-11 21:52:16 +0800803 fi
804 else
805 echo "* $name $sha1_abbr_src...$sha1_abbr_dst$total_commits:"
806 fi
807 if test -n "$errmsg"
808 then
809 # Don't give error msg for modification whose dst is not submodule
810 # i.e. deleted or changed to blob
811 test $mod_dst = 160000 && echo "$errmsg"
812 else
813 if test $mod_src = 160000 -a $mod_dst = 160000
814 then
Ping Yinf2dc06a2008-03-11 21:52:17 +0800815 limit=
816 test $summary_limit -gt 0 && limit="-$summary_limit"
Ping Yin1cb639e2008-03-11 21:52:16 +0800817 GIT_DIR="$name/.git" \
Ping Yinf2dc06a2008-03-11 21:52:17 +0800818 git log $limit --pretty='format: %m %s' \
Ping Yin1cb639e2008-03-11 21:52:16 +0800819 --first-parent $sha1_src...$sha1_dst
820 elif test $mod_dst = 160000
821 then
822 GIT_DIR="$name/.git" \
823 git log --pretty='format: > %s' -1 $sha1_dst
824 else
825 GIT_DIR="$name/.git" \
826 git log --pretty='format: < %s' -1 $sha1_src
827 fi
828 echo
829 fi
830 echo
Ping Yind0f64dd2008-04-12 23:05:31 +0800831 done |
832 if test -n "$for_status"; then
Jens Lehmannf17a5d32010-01-17 20:42:31 +0100833 if [ -n "$files" ]; then
Jon Seymour6ff875c2011-08-07 21:58:17 +1000834 gettextln "# Submodules changed but not updated:"
Jens Lehmannf17a5d32010-01-17 20:42:31 +0100835 else
Jon Seymour6ff875c2011-08-07 21:58:17 +1000836 gettextln "# Submodule changes to be committed:"
Jens Lehmannf17a5d32010-01-17 20:42:31 +0100837 fi
Ping Yind0f64dd2008-04-12 23:05:31 +0800838 echo "#"
839 sed -e 's|^|# |' -e 's|^# $|#|'
840 else
841 cat
842 fi
Ping Yin28f9af52008-03-11 21:52:15 +0800843}
Lars Hjemli70c7ac22007-05-26 15:56:40 +0200844#
Lars Hjemli941987a2007-06-11 21:12:24 +0200845# List all submodules, prefixed with:
Lars Hjemli70c7ac22007-05-26 15:56:40 +0200846# - submodule not initialized
847# + different revision checked out
848#
849# If --cached was specified the revision in the index will be printed
850# instead of the currently checked out revision.
851#
852# $@ = requested paths (default to all)
853#
Junio C Hamano23a485e2008-01-15 02:35:49 -0800854cmd_status()
Lars Hjemli70c7ac22007-05-26 15:56:40 +0200855{
Junio C Hamano5c08dbb2008-01-15 02:48:45 -0800856 # parse $args after "submodule ... status".
Kevin Ballard98dbe632010-11-02 23:26:25 -0700857 orig_flags=
Junio C Hamano5c08dbb2008-01-15 02:48:45 -0800858 while test $# -ne 0
859 do
860 case "$1" in
861 -q|--quiet)
Stephen Boyd2e6a30e2009-06-16 15:33:00 -0700862 GIT_QUIET=1
Junio C Hamano5c08dbb2008-01-15 02:48:45 -0800863 ;;
864 --cached)
865 cached=1
866 ;;
Johan Herland64b19ff2009-08-19 03:45:24 +0200867 --recursive)
868 recursive=1
869 ;;
Junio C Hamano5c08dbb2008-01-15 02:48:45 -0800870 --)
871 shift
872 break
873 ;;
874 -*)
875 usage
876 ;;
877 *)
878 break
879 ;;
880 esac
Kevin Ballard98dbe632010-11-02 23:26:25 -0700881 orig_flags="$orig_flags $(git rev-parse --sq-quote "$1")"
Junio C Hamano5c08dbb2008-01-15 02:48:45 -0800882 shift
883 done
884
David Aguilara7b32692008-08-22 00:30:50 -0700885 module_list "$@" |
Lars Hjemli70c7ac22007-05-26 15:56:40 +0200886 while read mode sha1 stage path
887 do
Lars Hjemli941987a2007-06-11 21:12:24 +0200888 name=$(module_name "$path") || exit
Junio C Hamano5be60072007-07-02 22:52:14 -0700889 url=$(git config submodule."$name".url)
Johan Herland64b19ff2009-08-19 03:45:24 +0200890 displaypath="$prefix$path"
Nicolas Morey-Chaisemartin313ee0d2011-03-30 07:20:02 +0200891 if test "$stage" = U
892 then
893 say "U$sha1 $displaypath"
894 continue
895 fi
Lars Hjemliba88a1f2008-02-20 23:13:15 +0100896 if test -z "$url" || ! test -d "$path"/.git -o -f "$path"/.git
Lars Hjemli70c7ac22007-05-26 15:56:40 +0200897 then
Johan Herland64b19ff2009-08-19 03:45:24 +0200898 say "-$sha1 $displaypath"
Lars Hjemli70c7ac22007-05-26 15:56:40 +0200899 continue;
900 fi
CJ van den Berg41c7c1b2007-07-04 18:22:14 +0200901 set_name_rev "$path" "$sha1"
Jens Lehmann18076502010-06-25 16:56:02 +0200902 if git diff-files --ignore-submodules=dirty --quiet -- "$path"
Lars Hjemli70c7ac22007-05-26 15:56:40 +0200903 then
Johan Herland64b19ff2009-08-19 03:45:24 +0200904 say " $sha1 $displaypath$revname"
Lars Hjemli70c7ac22007-05-26 15:56:40 +0200905 else
906 if test -z "$cached"
907 then
Giuseppe Bilotta74ae1412010-02-25 00:34:17 +0100908 sha1=$(clear_local_git_env; cd "$path" && git rev-parse --verify HEAD)
CJ van den Berg41c7c1b2007-07-04 18:22:14 +0200909 set_name_rev "$path" "$sha1"
Lars Hjemli70c7ac22007-05-26 15:56:40 +0200910 fi
Johan Herland64b19ff2009-08-19 03:45:24 +0200911 say "+$sha1 $displaypath$revname"
912 fi
913
914 if test -n "$recursive"
915 then
916 (
917 prefix="$displaypath/"
Giuseppe Bilotta74ae1412010-02-25 00:34:17 +0100918 clear_local_git_env
Johan Herland64b19ff2009-08-19 03:45:24 +0200919 cd "$path" &&
Kevin Ballarda7eff1a2010-11-02 23:26:24 -0700920 eval cmd_status "$orig_args"
Johan Herland64b19ff2009-08-19 03:45:24 +0200921 ) ||
Ævar Arnfjörð Bjarmason497ee872011-05-21 18:44:01 +0000922 die "$(eval_gettext "Failed to recurse into submodule path '\$path'")"
Lars Hjemli70c7ac22007-05-26 15:56:40 +0200923 fi
924 done
925}
David Aguilar2327f612008-08-24 12:43:37 -0700926#
927# Sync remote urls for submodules
928# This makes the value for remote.$remote.url match the value
929# specified in .gitmodules.
930#
931cmd_sync()
932{
933 while test $# -ne 0
934 do
935 case "$1" in
936 -q|--quiet)
Stephen Boyd2e6a30e2009-06-16 15:33:00 -0700937 GIT_QUIET=1
David Aguilar2327f612008-08-24 12:43:37 -0700938 shift
939 ;;
940 --)
941 shift
942 break
943 ;;
944 -*)
945 usage
946 ;;
947 *)
948 break
949 ;;
950 esac
951 done
952 cd_to_toplevel
953 module_list "$@" |
954 while read mode sha1 stage path
955 do
956 name=$(module_name "$path")
957 url=$(git config -f .gitmodules --get submodule."$name".url)
Johan Herlandbaede9f2008-09-22 18:08:31 +0200958
959 # Possibly a url relative to parent
960 case "$url" in
961 ./*|../*)
962 url=$(resolve_relative_url "$url") || exit
963 ;;
964 esac
965
Junio C Hamanoccee6082011-06-25 22:41:25 +0200966 if git config "submodule.$name.url" >/dev/null 2>/dev/null
David Aguilar2327f612008-08-24 12:43:37 -0700967 then
Junio C Hamano0591c0a2011-07-19 09:45:37 -0700968 say "$(eval_gettext "Synchronizing submodule url for '\$name'")"
Junio C Hamanoccee6082011-06-25 22:41:25 +0200969 git config submodule."$name".url "$url"
970
971 if test -e "$path"/.git
972 then
973 (
974 clear_local_git_env
975 cd "$path"
976 remote=$(get_default_remote)
977 git config remote."$remote".url "$url"
978 )
979 fi
David Aguilar2327f612008-08-24 12:43:37 -0700980 fi
981 done
982}
Lars Hjemli70c7ac22007-05-26 15:56:40 +0200983
Junio C Hamano5c08dbb2008-01-15 02:48:45 -0800984# This loop parses the command line arguments to find the
985# subcommand name to dispatch. Parsing of the subcommand specific
986# options are primarily done by the subcommand implementations.
987# Subcommand specific options such as --branch and --cached are
988# parsed here as well, for backward compatibility.
989
990while test $# != 0 && test -z "$command"
Lars Hjemli70c7ac22007-05-26 15:56:40 +0200991do
992 case "$1" in
David Aguilar2327f612008-08-24 12:43:37 -0700993 add | foreach | init | update | status | summary | sync)
Junio C Hamano5c08dbb2008-01-15 02:48:45 -0800994 command=$1
Lars Hjemli70c7ac22007-05-26 15:56:40 +0200995 ;;
996 -q|--quiet)
Stephen Boyd2e6a30e2009-06-16 15:33:00 -0700997 GIT_QUIET=1
Lars Hjemli70c7ac22007-05-26 15:56:40 +0200998 ;;
Sven Verdoolaegeecda0722007-06-24 23:06:07 +0200999 -b|--branch)
1000 case "$2" in
1001 '')
1002 usage
1003 ;;
1004 esac
1005 branch="$2"; shift
1006 ;;
Lars Hjemli70c7ac22007-05-26 15:56:40 +02001007 --cached)
Ping Yin28f9af52008-03-11 21:52:15 +08001008 cached="$1"
Lars Hjemli70c7ac22007-05-26 15:56:40 +02001009 ;;
1010 --)
1011 break
1012 ;;
1013 -*)
1014 usage
1015 ;;
1016 *)
1017 break
1018 ;;
1019 esac
1020 shift
1021done
1022
Junio C Hamano5c08dbb2008-01-15 02:48:45 -08001023# No command word defaults to "status"
1024test -n "$command" || command=status
Sven Verdoolaegeecda0722007-06-24 23:06:07 +02001025
Junio C Hamano5c08dbb2008-01-15 02:48:45 -08001026# "-b branch" is accepted only by "add"
1027if test -n "$branch" && test "$command" != add
1028then
Lars Hjemli70c7ac22007-05-26 15:56:40 +02001029 usage
Junio C Hamano5c08dbb2008-01-15 02:48:45 -08001030fi
1031
Ping Yin28f9af52008-03-11 21:52:15 +08001032# "--cached" is accepted only by "status" and "summary"
1033if test -n "$cached" && test "$command" != status -a "$command" != summary
Junio C Hamano5c08dbb2008-01-15 02:48:45 -08001034then
1035 usage
1036fi
1037
1038"cmd_$command" "$@"