blob: 25b1ddf2520800af4f78f1b7b72be2e271dfd8e2 [file] [log] [blame]
Lars Hjemli70c7ac22007-05-26 15:56:40 +02001#!/bin/sh
2#
Michał Górny4c8a9db2012-06-25 12:56:59 +02003# git-submodule.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/-/ /')
Junio C Hamano681b0362012-11-21 13:25:42 -08008USAGE="[--quiet] add [-b <branch>] [-f|--force] [--name <name>] [--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>...]
Jens Lehmanncf419822013-03-04 22:20:24 +010011 or: $dashless [--quiet] deinit [-f|--force] [--] <path>...
Jens Lehmann893a9762014-02-28 22:41:11 +000012 or: $dashless [--quiet] update [--init] [--remote] [-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--reference <repository>] [--recursive] [--] [<path>...]
Junio C Hamanoadc54232009-08-27 16:59:25 -070013 or: $dashless [--quiet] summary [--cached|--files] [--summary-limit <n>] [commit] [--] [<path>...]
Johan Herland15fc56a2009-08-19 03:45:22 +020014 or: $dashless [--quiet] foreach [--recursive] <command>
Phil Hord82f49f22012-10-26 15:44:42 -040015 or: $dashless [--quiet] sync [--recursive] [--] [<path>...]"
Junio C Hamano8f321a32007-11-06 01:50:02 -080016OPTIONS_SPEC=
John Keeping091a6eb2013-06-16 15:18:18 +010017SUBDIRECTORY_OK=Yes
Lars Hjemli70c7ac22007-05-26 15:56:40 +020018. git-sh-setup
Ævar Arnfjörð Bjarmasond0ad8252011-05-21 18:43:58 +000019. git-sh-i18n
Mark Levedahl98fcf842008-08-24 14:46:10 -040020. git-parse-remote
Lars Hjemli70c7ac22007-05-26 15:56:40 +020021require_work_tree
John Keeping091a6eb2013-06-16 15:18:18 +010022wt_prefix=$(git rev-parse --show-prefix)
23cd_to_toplevel
Lars Hjemli70c7ac22007-05-26 15:56:40 +020024
Junio C Hamano5c08dbb2008-01-15 02:48:45 -080025command=
Sven Verdoolaegeecda0722007-06-24 23:06:07 +020026branch=
Jens Lehmannd27b8762010-07-17 17:11:43 +020027force=
Michael S. Tsirkind92a3952009-05-04 22:30:01 +030028reference=
Lars Hjemli70c7ac22007-05-26 15:56:40 +020029cached=
Gerrit Pape48bb3032010-04-26 11:50:39 +020030recursive=
31init=
Jens Lehmann1c244f62009-08-13 21:32:50 +020032files=
W. Trevor King06b1abb2012-12-19 11:03:32 -050033remote=
Fabian Franz31ca3ac2009-02-05 20:18:32 -020034nofetch=
Johan Herland32948422009-06-03 08:27:06 +020035update=
Johan Herland15fc56a2009-08-19 03:45:22 +020036prefix=
Jens Lehmann73b08982012-09-30 01:05:58 +020037custom_name=
Fredrik Gustafsson275cd182013-07-02 23:42:56 +020038depth=
Lars Hjemli70c7ac22007-05-26 15:56:40 +020039
Jon Seymour967b2c62012-06-06 21:57:29 +100040# The function takes at most 2 arguments. The first argument is the
41# URL that navigates to the submodule origin repo. When relative, this URL
42# is relative to the superproject origin URL repo. The second up_path
43# argument, if specified, is the relative path that navigates
44# from the submodule working tree to the superproject working tree.
45#
46# The output of the function is the origin URL of the submodule.
47#
48# The output will either be an absolute URL or filesystem path (if the
49# superproject origin URL is an absolute URL or filesystem path,
50# respectively) or a relative file system path (if the superproject
51# origin URL is a relative file system path).
52#
53# When the output is a relative file system path, the path is either
54# relative to the submodule working tree, if up_path is specified, or to
55# the superproject working tree otherwise.
Mark Levedahlf31a5222007-09-23 22:19:42 -040056resolve_relative_url ()
57{
Mark Levedahl98fcf842008-08-24 14:46:10 -040058 remote=$(get_default_remote)
Mark Levedahl8e7e6f32008-06-14 13:09:41 -040059 remoteurl=$(git config "remote.$remote.url") ||
Jens Lehmann4d689322011-06-06 21:58:04 +020060 remoteurl=$(pwd) # the repository is its own authoritative upstream
Mark Levedahlf31a5222007-09-23 22:19:42 -040061 url="$1"
Mark Levedahl99b120a2008-08-21 19:54:01 -040062 remoteurl=${remoteurl%/}
Thomas Rastea640cc2011-01-10 11:37:26 +010063 sep=/
Jon Seymour967b2c62012-06-06 21:57:29 +100064 up_path="$2"
65
66 case "$remoteurl" in
67 *:*|/*)
68 is_relative=
69 ;;
Jon Seymour758615e2012-06-06 21:57:30 +100070 ./*|../*)
71 is_relative=t
72 ;;
Jon Seymour967b2c62012-06-06 21:57:29 +100073 *)
74 is_relative=t
Jon Seymour758615e2012-06-06 21:57:30 +100075 remoteurl="./$remoteurl"
Jon Seymour967b2c62012-06-06 21:57:29 +100076 ;;
77 esac
78
Mark Levedahlf31a5222007-09-23 22:19:42 -040079 while test -n "$url"
80 do
81 case "$url" in
82 ../*)
83 url="${url#../}"
Thomas Rastea640cc2011-01-10 11:37:26 +010084 case "$remoteurl" in
85 */*)
86 remoteurl="${remoteurl%/*}"
87 ;;
88 *:*)
89 remoteurl="${remoteurl%:*}"
90 sep=:
91 ;;
92 *)
Jon Seymour758615e2012-06-06 21:57:30 +100093 if test -z "$is_relative" || test "." = "$remoteurl"
94 then
95 die "$(eval_gettext "cannot strip one component off url '\$remoteurl'")"
96 else
97 remoteurl=.
98 fi
Thomas Rastea640cc2011-01-10 11:37:26 +010099 ;;
100 esac
Mark Levedahlf31a5222007-09-23 22:19:42 -0400101 ;;
102 ./*)
103 url="${url#./}"
104 ;;
105 *)
106 break;;
107 esac
108 done
Jon Seymour758615e2012-06-06 21:57:30 +1000109 remoteurl="$remoteurl$sep${url%/}"
110 echo "${is_relative:+${up_path}}${remoteurl#./}"
Mark Levedahlf31a5222007-09-23 22:19:42 -0400111}
112
John Keeping091a6eb2013-06-16 15:18:18 +0100113# Resolve a path to be relative to another path. This is intended for
114# converting submodule paths when git-submodule is run in a subdirectory
115# and only handles paths where the directory separator is '/'.
116#
117# The output is the first argument as a path relative to the second argument,
118# which defaults to $wt_prefix if it is omitted.
119relative_path ()
120{
121 local target curdir result
122 target=$1
123 curdir=${2-$wt_prefix}
124 curdir=${curdir%/}
125 result=
126
127 while test -n "$curdir"
128 do
129 case "$target" in
130 "$curdir/"*)
131 target=${target#"$curdir"/}
132 break
133 ;;
134 esac
135
136 result="${result}../"
137 if test "$curdir" = "${curdir%/*}"
138 then
139 curdir=
140 else
141 curdir="${curdir%/*}"
142 fi
143 done
144
145 echo "$result$target"
146}
147
Lars Hjemli941987a2007-06-11 21:12:24 +0200148#
David Aguilara7b32692008-08-22 00:30:50 -0700149# Get submodule info for registered submodules
150# $@ = path to limit submodule list
151#
152module_list()
153{
John Keeping091a6eb2013-06-16 15:18:18 +0100154 eval "set $(git rev-parse --sq --prefix "$wt_prefix" -- "$@")"
Heiko Voigtbe9d0a32012-08-14 22:35:27 +0200155 (
Fredrik Gustafsson74671242013-06-14 02:26:02 +0200156 git ls-files -z --error-unmatch --stage -- "$@" ||
Heiko Voigtbe9d0a32012-08-14 22:35:27 +0200157 echo "unmatched pathspec exists"
158 ) |
Jeff Kingfcb06a82013-10-28 21:19:59 -0400159 @@PERL@@ -e '
Nicolas Morey-Chaisemartin313ee0d2011-03-30 07:20:02 +0200160 my %unmerged = ();
161 my ($null_sha1) = ("0" x 40);
Heiko Voigtbe9d0a32012-08-14 22:35:27 +0200162 my @out = ();
163 my $unmatched = 0;
Fredrik Gustafsson74671242013-06-14 02:26:02 +0200164 $/ = "\0";
Nicolas Morey-Chaisemartin313ee0d2011-03-30 07:20:02 +0200165 while (<STDIN>) {
Heiko Voigtbe9d0a32012-08-14 22:35:27 +0200166 if (/^unmatched pathspec/) {
167 $unmatched = 1;
168 next;
169 }
Nicolas Morey-Chaisemartin313ee0d2011-03-30 07:20:02 +0200170 chomp;
171 my ($mode, $sha1, $stage, $path) =
172 /^([0-7]+) ([0-9a-f]{40}) ([0-3])\t(.*)$/;
173 next unless $mode eq "160000";
174 if ($stage ne "0") {
175 if (!$unmerged{$path}++) {
Heiko Voigtbe9d0a32012-08-14 22:35:27 +0200176 push @out, "$mode $null_sha1 U\t$path\n";
Nicolas Morey-Chaisemartin313ee0d2011-03-30 07:20:02 +0200177 }
178 next;
179 }
Heiko Voigtbe9d0a32012-08-14 22:35:27 +0200180 push @out, "$_\n";
181 }
182 if ($unmatched) {
183 print "#unmatched\n";
184 } else {
185 print for (@out);
Nicolas Morey-Chaisemartin313ee0d2011-03-30 07:20:02 +0200186 }
187 '
David Aguilara7b32692008-08-22 00:30:50 -0700188}
189
Heiko Voigtbe9d0a32012-08-14 22:35:27 +0200190die_if_unmatched ()
191{
192 if test "$1" = "#unmatched"
193 then
194 exit 1
195 fi
196}
197
David Aguilara7b32692008-08-22 00:30:50 -0700198#
W. Trevor King88ce00c2012-12-11 13:58:15 -0500199# Print a submodule configuration setting
200#
201# $1 = submodule name
202# $2 = option name
203# $3 = default value
204#
205# Checks in the usual git-config places first (for overrides),
206# otherwise it falls back on .gitmodules. This allows you to
207# distribute project-wide defaults in .gitmodules, while still
208# customizing individual repositories if necessary. If the option is
209# not in .gitmodules either, print a default value.
210#
211get_submodule_config () {
212 name="$1"
213 option="$2"
214 default="$3"
215 value=$(git config submodule."$name"."$option")
216 if test -z "$value"
217 then
218 value=$(git config -f .gitmodules submodule."$name"."$option")
219 fi
220 printf '%s' "${value:-$default}"
221}
222
223
224#
Lars Hjemli941987a2007-06-11 21:12:24 +0200225# Map submodule path to submodule name
226#
227# $1 = path
228#
229module_name()
230{
Junio C Hamano537601a2007-07-25 15:51:26 -0700231 # Do we have "submodule.<something>.path = $1" defined in .gitmodules file?
Ramsay Jones64394e32012-04-17 19:00:58 +0100232 sm_path="$1"
Chris Riddfe22e542008-06-11 14:09:19 +0100233 re=$(printf '%s\n' "$1" | sed -e 's/[].[^$\\*]/\\&/g')
Imran M Yousufa5099bb2008-05-15 13:42:58 +0600234 name=$( git config -f .gitmodules --get-regexp '^submodule\..*\.path$' |
Junio C Hamano537601a2007-07-25 15:51:26 -0700235 sed -n -e 's|^submodule\.\(.*\)\.path '"$re"'$|\1|p' )
Tay Ray Chuan1e422582011-10-21 21:49:35 +0800236 test -z "$name" &&
Ramsay Jones64394e32012-04-17 19:00:58 +0100237 die "$(eval_gettext "No submodule mapping found in .gitmodules for path '\$sm_path'")"
Junio C Hamano6a066232014-06-10 08:33:39 -0700238 printf '%s\n' "$name"
Lars Hjemli941987a2007-06-11 21:12:24 +0200239}
Lars Hjemli33aa6ff2007-06-06 11:13:01 +0200240
241#
242# Clone a submodule
243#
W. Trevor King9adfc1c2014-01-15 20:10:23 -0800244# $1 = submodule path
245# $2 = submodule name
246# $3 = URL to clone
247# $4 = reference repository to reuse (empty for independent)
248# $5 = depth argument for shallow clones (empty for deep)
249#
Junio C Hamano23a485e2008-01-15 02:35:49 -0800250# Prior to calling, cmd_update checks that a possibly existing
Sven Verdoolaegeecda0722007-06-24 23:06:07 +0200251# path is not a git repository.
Junio C Hamano23a485e2008-01-15 02:35:49 -0800252# Likewise, cmd_add checks that path does not exist at all,
Sven Verdoolaegeecda0722007-06-24 23:06:07 +0200253# since it is the location of a new submodule.
254#
Lars Hjemli33aa6ff2007-06-06 11:13:01 +0200255module_clone()
256{
Ramsay Jones64394e32012-04-17 19:00:58 +0100257 sm_path=$1
Jens Lehmann73b08982012-09-30 01:05:58 +0200258 name=$2
259 url=$3
260 reference="$4"
Fredrik Gustafsson275cd182013-07-02 23:42:56 +0200261 depth="$5"
Jens Lehmann7e604072011-07-26 23:39:03 +0200262 quiet=
263 if test -n "$GIT_QUIET"
264 then
265 quiet=-q
266 fi
Lars Hjemli33aa6ff2007-06-06 11:13:01 +0200267
Fredrik Gustafsson501770e2011-08-15 23:17:47 +0200268 gitdir=
269 gitdir_base=
Jens Lehmann69c30512012-03-04 22:15:36 +0100270 base_name=$(dirname "$name")
Lars Hjemli33aa6ff2007-06-06 11:13:01 +0200271
Fredrik Gustafsson501770e2011-08-15 23:17:47 +0200272 gitdir=$(git rev-parse --git-dir)
Jens Lehmann69c30512012-03-04 22:15:36 +0100273 gitdir_base="$gitdir/modules/$base_name"
274 gitdir="$gitdir/modules/$name"
Fredrik Gustafsson501770e2011-08-15 23:17:47 +0200275
276 if test -d "$gitdir"
Michael S. Tsirkind92a3952009-05-04 22:30:01 +0300277 then
Ramsay Jones64394e32012-04-17 19:00:58 +0100278 mkdir -p "$sm_path"
Fredrik Gustafsson501770e2011-08-15 23:17:47 +0200279 rm -f "$gitdir/index"
Michael S. Tsirkind92a3952009-05-04 22:30:01 +0300280 else
Fredrik Gustafsson501770e2011-08-15 23:17:47 +0200281 mkdir -p "$gitdir_base"
Daniel Grañabe8779f2012-07-22 11:49:44 -0300282 (
283 clear_local_git_env
Fredrik Gustafsson275cd182013-07-02 23:42:56 +0200284 git clone $quiet ${depth:+"$depth"} -n ${reference:+"$reference"} \
Daniel Grañabe8779f2012-07-22 11:49:44 -0300285 --separate-git-dir "$gitdir" "$url" "$sm_path"
286 ) ||
Ramsay Jones64394e32012-04-17 19:00:58 +0100287 die "$(eval_gettext "Clone of '\$url' into submodule path '\$sm_path' failed")"
Fredrik Gustafsson501770e2011-08-15 23:17:47 +0200288 fi
Jens Lehmannea115a02012-03-04 22:14:30 +0100289
Jens Lehmann6eafa6d2012-07-12 19:45:32 +0200290 # We already are at the root of the work tree but cd_to_toplevel will
291 # resolve any symlinks that might be present in $PWD
292 a=$(cd_to_toplevel && cd "$gitdir" && pwd)/
Junio C Hamano15b3c822012-07-22 12:55:47 -0700293 b=$(cd_to_toplevel && cd "$sm_path" && pwd)/
Jens Lehmannd75219b2012-03-04 22:15:08 +0100294 # Remove all common leading directories after a sanity check
295 if test "${a#$b}" != "$a" || test "${b#$a}" != "$b"; then
296 die "$(eval_gettext "Gitdir '\$a' is part of the submodule path '\$b' or vice versa")"
297 fi
298 while test "${a%%/*}" = "${b%%/*}"
299 do
300 a=${a#*/}
301 b=${b#*/}
302 done
303 # Now chop off the trailing '/'s that were added in the beginning
304 a=${a%/}
305 b=${b%/}
306
Ben Waltonc5bc42b2012-04-09 16:08:02 -0400307 # Turn each leading "*/" component into "../"
Junio C Hamano6a066232014-06-10 08:33:39 -0700308 rel=$(printf '%s\n' "$b" | sed -e 's|[^/][^/]*|..|g')
309 printf '%s\n' "gitdir: $rel/$a" >"$sm_path/.git"
Jens Lehmann69c30512012-03-04 22:15:36 +0100310
Junio C Hamano6a066232014-06-10 08:33:39 -0700311 rel=$(printf '%s\n' "$a" | sed -e 's|[^/][^/]*|..|g')
Junio C Hamanod851ffb2014-04-02 14:15:36 -0700312 (clear_local_git_env; cd "$sm_path" && GIT_WORK_TREE=. git config core.worktree "$rel/$b")
Lars Hjemli33aa6ff2007-06-06 11:13:01 +0200313}
314
René Scharfe862ae6c2013-04-01 15:06:27 +0200315isnumber()
316{
317 n=$(($1 + 0)) 2>/dev/null && test "$n" = "$1"
318}
319
Lars Hjemli70c7ac22007-05-26 15:56:40 +0200320#
Sven Verdoolaegeecda0722007-06-24 23:06:07 +0200321# Add a new submodule to the working tree, .gitmodules and the index
322#
Mark Levedahlec05df32008-07-09 21:05:40 -0400323# $@ = repo path
Sven Verdoolaegeecda0722007-06-24 23:06:07 +0200324#
325# optional branch is stored in global branch variable
326#
Junio C Hamano23a485e2008-01-15 02:35:49 -0800327cmd_add()
Sven Verdoolaegeecda0722007-06-24 23:06:07 +0200328{
Junio C Hamano5c08dbb2008-01-15 02:48:45 -0800329 # parse $args after "submodule ... add".
John Keeping091a6eb2013-06-16 15:18:18 +0100330 reference_path=
Junio C Hamano5c08dbb2008-01-15 02:48:45 -0800331 while test $# -ne 0
332 do
333 case "$1" in
334 -b | --branch)
335 case "$2" in '') usage ;; esac
336 branch=$2
337 shift
338 ;;
Jens Lehmannd27b8762010-07-17 17:11:43 +0200339 -f | --force)
340 force=$1
341 ;;
Junio C Hamano5c08dbb2008-01-15 02:48:45 -0800342 -q|--quiet)
Stephen Boyd2e6a30e2009-06-16 15:33:00 -0700343 GIT_QUIET=1
Junio C Hamano5c08dbb2008-01-15 02:48:45 -0800344 ;;
Michael S. Tsirkind92a3952009-05-04 22:30:01 +0300345 --reference)
346 case "$2" in '') usage ;; esac
John Keeping091a6eb2013-06-16 15:18:18 +0100347 reference_path=$2
Michael S. Tsirkind92a3952009-05-04 22:30:01 +0300348 shift
349 ;;
350 --reference=*)
John Keeping091a6eb2013-06-16 15:18:18 +0100351 reference_path="${1#--reference=}"
Michael S. Tsirkind92a3952009-05-04 22:30:01 +0300352 ;;
Jens Lehmann73b08982012-09-30 01:05:58 +0200353 --name)
354 case "$2" in '') usage ;; esac
355 custom_name=$2
356 shift
357 ;;
Fredrik Gustafsson275cd182013-07-02 23:42:56 +0200358 --depth)
359 case "$2" in '') usage ;; esac
360 depth="--depth=$2"
361 shift
362 ;;
363 --depth=*)
364 depth=$1
365 ;;
Junio C Hamano5c08dbb2008-01-15 02:48:45 -0800366 --)
367 shift
368 break
369 ;;
370 -*)
371 usage
372 ;;
373 *)
374 break
375 ;;
376 esac
377 shift
378 done
379
John Keeping091a6eb2013-06-16 15:18:18 +0100380 if test -n "$reference_path"
381 then
382 is_absolute_path "$reference_path" ||
383 reference_path="$wt_prefix$reference_path"
384
385 reference="--reference=$reference_path"
386 fi
387
Sven Verdoolaegeecda0722007-06-24 23:06:07 +0200388 repo=$1
Ramsay Jones64394e32012-04-17 19:00:58 +0100389 sm_path=$2
Sven Verdoolaegeecda0722007-06-24 23:06:07 +0200390
Ramsay Jones64394e32012-04-17 19:00:58 +0100391 if test -z "$sm_path"; then
Junio C Hamano6a066232014-06-10 08:33:39 -0700392 sm_path=$(printf '%s\n' "$repo" |
Jens Lehmann1414e572009-09-22 17:10:12 +0200393 sed -e 's|/$||' -e 's|:*/*\.git$||' -e 's|.*[/:]||g')
394 fi
395
Elia Pinto496eeeb2014-06-10 05:28:33 -0700396 if test -z "$repo" || test -z "$sm_path"; then
Sven Verdoolaegeecda0722007-06-24 23:06:07 +0200397 usage
398 fi
399
John Keeping091a6eb2013-06-16 15:18:18 +0100400 is_absolute_path "$sm_path" || sm_path="$wt_prefix$sm_path"
401
Mark Levedahlec05df32008-07-09 21:05:40 -0400402 # assure repo is absolute or relative to parent
403 case "$repo" in
404 ./*|../*)
John Keeping091a6eb2013-06-16 15:18:18 +0100405 test -z "$wt_prefix" ||
406 die "$(gettext "Relative path can only be used from the toplevel of the working tree")"
407
Mark Levedahlec05df32008-07-09 21:05:40 -0400408 # dereference source url relative to parent's url
409 realrepo=$(resolve_relative_url "$repo") || exit
410 ;;
411 *:*|/*)
412 # absolute url
413 realrepo=$repo
414 ;;
415 *)
Ævar Arnfjörð Bjarmason497ee872011-05-21 18:44:01 +0000416 die "$(eval_gettext "repo URL: '\$repo' must be absolute or begin with ./|../")"
Mark Levedahlec05df32008-07-09 21:05:40 -0400417 ;;
418 esac
419
Michael J Gruberdb75ada2009-03-03 16:08:21 +0100420 # normalize path:
421 # multiple //; leading ./; /./; /../; trailing /
Ramsay Jones64394e32012-04-17 19:00:58 +0100422 sm_path=$(printf '%s/\n' "$sm_path" |
Michael J Gruberdb75ada2009-03-03 16:08:21 +0100423 sed -e '
424 s|//*|/|g
425 s|^\(\./\)*||
Patrick Steinhardt8196e722015-01-30 16:14:03 +0100426 s|/\(\./\)*|/|g
Michael J Gruberdb75ada2009-03-03 16:08:21 +0100427 :start
428 s|\([^/]*\)/\.\./||
429 tstart
430 s|/*$||
431 ')
Ramsay Jones64394e32012-04-17 19:00:58 +0100432 git ls-files --error-unmatch "$sm_path" > /dev/null 2>&1 &&
433 die "$(eval_gettext "'\$sm_path' already exists in the index")"
Sven Verdoolaegeecda0722007-06-24 23:06:07 +0200434
Ramsay Jones64394e32012-04-17 19:00:58 +0100435 if test -z "$force" && ! git add --dry-run --ignore-missing "$sm_path" > /dev/null 2>&1
Jens Lehmannd27b8762010-07-17 17:11:43 +0200436 then
Jon Seymour6ff875c2011-08-07 21:58:17 +1000437 eval_gettextln "The following path is ignored by one of your .gitignore files:
Ramsay Jones64394e32012-04-17 19:00:58 +0100438\$sm_path
Jon Seymour6ff875c2011-08-07 21:58:17 +1000439Use -f if you really want to add it." >&2
Jens Lehmannd27b8762010-07-17 17:11:43 +0200440 exit 1
441 fi
442
Jens Lehmann73b08982012-09-30 01:05:58 +0200443 if test -n "$custom_name"
444 then
445 sm_name="$custom_name"
446 else
447 sm_name="$sm_path"
448 fi
449
Mark Levedahld4264ca2008-03-04 20:15:02 -0500450 # perhaps the path exists and is already a git repo, else clone it
Ramsay Jones64394e32012-04-17 19:00:58 +0100451 if test -e "$sm_path"
Mark Levedahld4264ca2008-03-04 20:15:02 -0500452 then
Elia Pinto496eeeb2014-06-10 05:28:33 -0700453 if test -d "$sm_path"/.git || test -f "$sm_path"/.git
Mark Levedahld4264ca2008-03-04 20:15:02 -0500454 then
Ramsay Jones64394e32012-04-17 19:00:58 +0100455 eval_gettextln "Adding existing repo at '\$sm_path' to the index"
Mark Levedahld4264ca2008-03-04 20:15:02 -0500456 else
Ramsay Jones64394e32012-04-17 19:00:58 +0100457 die "$(eval_gettext "'\$sm_path' already exists and is not a valid git repo")"
Mark Levedahld4264ca2008-03-04 20:15:02 -0500458 fi
Mark Levedahlc2f93912008-07-09 21:05:41 -0400459
Mark Levedahld4264ca2008-03-04 20:15:02 -0500460 else
Jens Lehmann4b7c2862012-09-30 23:01:29 +0200461 if test -d ".git/modules/$sm_name"
462 then
463 if test -z "$force"
464 then
465 echo >&2 "$(eval_gettext "A git directory for '\$sm_name' is found locally with remote(s):")"
466 GIT_DIR=".git/modules/$sm_name" GIT_WORK_TREE=. git remote -v | grep '(fetch)' | sed -e s,^," ", -e s,' (fetch)',, >&2
467 echo >&2 "$(eval_gettext "If you want to reuse this local git directory instead of cloning again from")"
468 echo >&2 " $realrepo"
469 echo >&2 "$(eval_gettext "use the '--force' option. If the local git directory is not the correct repo")"
470 die "$(eval_gettext "or you are unsure what this means choose another name with the '--name' option.")"
471 else
472 echo "$(eval_gettext "Reactivating local git directory for submodule '\$sm_name'.")"
473 fi
474 fi
Junio C Hamanod851ffb2014-04-02 14:15:36 -0700475 module_clone "$sm_path" "$sm_name" "$realrepo" "$reference" "$depth" || exit
476 (
477 clear_local_git_env
478 cd "$sm_path" &&
479 # ash fails to wordsplit ${branch:+-b "$branch"...}
480 case "$branch" in
481 '') git checkout -f -q ;;
482 ?*) git checkout -f -q -B "$branch" "origin/$branch" ;;
483 esac
484 ) || die "$(eval_gettext "Unable to checkout submodule '\$sm_path'")"
Mark Levedahld4264ca2008-03-04 20:15:02 -0500485 fi
Jens Lehmann73b08982012-09-30 01:05:58 +0200486 git config submodule."$sm_name".url "$realrepo"
Mark Levedahld4264ca2008-03-04 20:15:02 -0500487
Ramsay Jones64394e32012-04-17 19:00:58 +0100488 git add $force "$sm_path" ||
489 die "$(eval_gettext "Failed to add submodule '\$sm_path'")"
Sven Verdoolaegeecda0722007-06-24 23:06:07 +0200490
Jens Lehmann73b08982012-09-30 01:05:58 +0200491 git config -f .gitmodules submodule."$sm_name".path "$sm_path" &&
492 git config -f .gitmodules submodule."$sm_name".url "$repo" &&
W. Trevor Kingb9289222012-12-19 11:03:33 -0500493 if test -n "$branch"
494 then
495 git config -f .gitmodules submodule."$sm_name".branch "$branch"
496 fi &&
Ævar Arnfjörð Bjarmason31991b02010-07-05 17:33:03 +0000497 git add --force .gitmodules ||
Ramsay Jones64394e32012-04-17 19:00:58 +0100498 die "$(eval_gettext "Failed to register submodule '\$sm_path'")"
Sven Verdoolaegeecda0722007-06-24 23:06:07 +0200499}
500
501#
Mark Levedahl19a31f92008-08-10 19:10:04 -0400502# Execute an arbitrary command sequence in each checked out
503# submodule
504#
505# $@ = command to execute
506#
507cmd_foreach()
508{
Johan Herland1d5bec82009-08-19 03:45:19 +0200509 # parse $args after "submodule ... foreach".
510 while test $# -ne 0
511 do
512 case "$1" in
513 -q|--quiet)
514 GIT_QUIET=1
515 ;;
Johan Herland15fc56a2009-08-19 03:45:22 +0200516 --recursive)
517 recursive=1
518 ;;
Johan Herland1d5bec82009-08-19 03:45:19 +0200519 -*)
520 usage
521 ;;
522 *)
523 break
524 ;;
525 esac
526 shift
527 done
528
Ævar Arnfjörð Bjarmasonf030c962010-05-21 16:10:10 +0000529 toplevel=$(pwd)
530
Brandon Casey4dca1aa2011-06-29 19:34:58 -0500531 # dup stdin so that it can be restored when running the external
532 # command in the subshell (and a recursive call to this function)
533 exec 3<&0
534
David Aguilara7b32692008-08-22 00:30:50 -0700535 module_list |
Ramsay Jones64394e32012-04-17 19:00:58 +0100536 while read mode sha1 stage sm_path
Mark Levedahl19a31f92008-08-10 19:10:04 -0400537 do
Heiko Voigtbe9d0a32012-08-14 22:35:27 +0200538 die_if_unmatched "$mode"
Ramsay Jones64394e32012-04-17 19:00:58 +0100539 if test -e "$sm_path"/.git
Mark Levedahl19a31f92008-08-10 19:10:04 -0400540 then
John Keeping091a6eb2013-06-16 15:18:18 +0100541 displaypath=$(relative_path "$sm_path")
542 say "$(eval_gettext "Entering '\$prefix\$displaypath'")"
Ramsay Jones64394e32012-04-17 19:00:58 +0100543 name=$(module_name "$sm_path")
Johan Herland15fc56a2009-08-19 03:45:22 +0200544 (
Ramsay Jones64394e32012-04-17 19:00:58 +0100545 prefix="$prefix$sm_path/"
Giuseppe Bilotta74ae1412010-02-25 00:34:17 +0100546 clear_local_git_env
Ramsay Jones64394e32012-04-17 19:00:58 +0100547 cd "$sm_path" &&
John Keeping091a6eb2013-06-16 15:18:18 +0100548 sm_path=$(relative_path "$sm_path") &&
549 # we make $path available to scripts ...
550 path=$sm_path &&
Anders Kaseorg1c4fb132013-09-27 06:23:55 -0400551 if test $# -eq 1
552 then
553 eval "$1"
554 else
555 "$@"
556 fi &&
Johan Herland15fc56a2009-08-19 03:45:22 +0200557 if test -n "$recursive"
558 then
559 cmd_foreach "--recursive" "$@"
560 fi
Brandon Casey4dca1aa2011-06-29 19:34:58 -0500561 ) <&3 3<&- ||
John Keeping091a6eb2013-06-16 15:18:18 +0100562 die "$(eval_gettext "Stopping at '\$prefix\$displaypath'; script returned non-zero status.")"
Mark Levedahl19a31f92008-08-10 19:10:04 -0400563 fi
564 done
565}
566
567#
Lars Hjemli211b7f12007-06-06 11:13:02 +0200568# Register submodules in .git/config
Lars Hjemli70c7ac22007-05-26 15:56:40 +0200569#
570# $@ = requested paths (default to all)
571#
Junio C Hamano23a485e2008-01-15 02:35:49 -0800572cmd_init()
Lars Hjemli70c7ac22007-05-26 15:56:40 +0200573{
Junio C Hamano5c08dbb2008-01-15 02:48:45 -0800574 # parse $args after "submodule ... init".
575 while test $# -ne 0
576 do
577 case "$1" in
578 -q|--quiet)
Stephen Boyd2e6a30e2009-06-16 15:33:00 -0700579 GIT_QUIET=1
Junio C Hamano5c08dbb2008-01-15 02:48:45 -0800580 ;;
581 --)
582 shift
583 break
584 ;;
585 -*)
586 usage
587 ;;
588 *)
589 break
590 ;;
591 esac
592 shift
593 done
594
David Aguilara7b32692008-08-22 00:30:50 -0700595 module_list "$@" |
Ramsay Jones64394e32012-04-17 19:00:58 +0100596 while read mode sha1 stage sm_path
Lars Hjemli70c7ac22007-05-26 15:56:40 +0200597 do
Heiko Voigtbe9d0a32012-08-14 22:35:27 +0200598 die_if_unmatched "$mode"
Ramsay Jones64394e32012-04-17 19:00:58 +0100599 name=$(module_name "$sm_path") || exit
Jens Lehmannc1c259e2012-05-28 21:46:58 +0200600
John Keeping091a6eb2013-06-16 15:18:18 +0100601 displaypath=$(relative_path "$sm_path")
602
Jens Lehmannc1c259e2012-05-28 21:46:58 +0200603 # Copy url setting when it is not set yet
Jens Lehmann2cd9de32011-06-26 01:26:02 +0200604 if test -z "$(git config "submodule.$name.url")"
605 then
606 url=$(git config -f .gitmodules submodule."$name".url)
607 test -z "$url" &&
John Keeping091a6eb2013-06-16 15:18:18 +0100608 die "$(eval_gettext "No url found for submodule path '\$displaypath' in .gitmodules")"
Lars Hjemli70c7ac22007-05-26 15:56:40 +0200609
Jens Lehmann2cd9de32011-06-26 01:26:02 +0200610 # Possibly a url relative to parent
611 case "$url" in
612 ./*|../*)
613 url=$(resolve_relative_url "$url") || exit
614 ;;
615 esac
616 git config submodule."$name".url "$url" ||
John Keeping091a6eb2013-06-16 15:18:18 +0100617 die "$(eval_gettext "Failed to register url for submodule path '\$displaypath'")"
Jens Lehmannc1c259e2012-05-28 21:46:58 +0200618
John Keeping091a6eb2013-06-16 15:18:18 +0100619 say "$(eval_gettext "Submodule '\$name' (\$url) registered for path '\$displaypath'")"
Jens Lehmann2cd9de32011-06-26 01:26:02 +0200620 fi
Lars Hjemli70c7ac22007-05-26 15:56:40 +0200621
Jens Lehmann2cd9de32011-06-26 01:26:02 +0200622 # Copy "update" setting when it is not set yet
Junio C Hamanoac1fbbd2013-12-02 13:31:55 -0800623 if upd="$(git config -f .gitmodules submodule."$name".update)" &&
624 test -n "$upd" &&
625 test -z "$(git config submodule."$name".update)"
626 then
627 case "$upd" in
Francesco Prettoefa8fd72014-01-05 03:50:48 +0100628 checkout | rebase | merge | none)
Junio C Hamanoac1fbbd2013-12-02 13:31:55 -0800629 ;; # known modes of updating
630 *)
631 echo >&2 "warning: unknown update mode '$upd' suggested for submodule '$name'"
632 upd=none
633 ;;
634 esac
635 git config submodule."$name".update "$upd" ||
636 die "$(eval_gettext "Failed to register update mode for submodule path '\$displaypath'")"
637 fi
Lars Hjemli70c7ac22007-05-26 15:56:40 +0200638 done
639}
640
641#
Jens Lehmanncf419822013-03-04 22:20:24 +0100642# Unregister submodules from .git/config and remove their work tree
643#
644# $@ = requested paths (use '.' to deinit all submodules)
645#
646cmd_deinit()
647{
648 # parse $args after "submodule ... deinit".
649 while test $# -ne 0
650 do
651 case "$1" in
652 -f|--force)
653 force=$1
654 ;;
655 -q|--quiet)
656 GIT_QUIET=1
657 ;;
658 --)
659 shift
660 break
661 ;;
662 -*)
663 usage
664 ;;
665 *)
666 break
667 ;;
668 esac
669 shift
670 done
671
672 if test $# = 0
673 then
674 die "$(eval_gettext "Use '.' if you really want to deinitialize all submodules")"
675 fi
676
677 module_list "$@" |
678 while read mode sha1 stage sm_path
679 do
680 die_if_unmatched "$mode"
681 name=$(module_name "$sm_path") || exit
682
John Keeping091a6eb2013-06-16 15:18:18 +0100683 displaypath=$(relative_path "$sm_path")
684
Jens Lehmanncf419822013-03-04 22:20:24 +0100685 # Remove the submodule work tree (unless the user already did it)
686 if test -d "$sm_path"
687 then
688 # Protect submodules containing a .git directory
689 if test -d "$sm_path/.git"
690 then
John Keeping091a6eb2013-06-16 15:18:18 +0100691 echo >&2 "$(eval_gettext "Submodule work tree '\$displaypath' contains a .git directory")"
Jens Lehmanncf419822013-03-04 22:20:24 +0100692 die "$(eval_gettext "(use 'rm -rf' if you really want to remove it including all of its history)")"
693 fi
694
695 if test -z "$force"
696 then
Jens Lehmann7b294bf2013-04-01 21:02:00 +0200697 git rm -qn "$sm_path" ||
John Keeping091a6eb2013-06-16 15:18:18 +0100698 die "$(eval_gettext "Submodule work tree '\$displaypath' contains local modifications; use '-f' to discard them")"
Jens Lehmanncf419822013-03-04 22:20:24 +0100699 fi
Jens Lehmann7b294bf2013-04-01 21:02:00 +0200700 rm -rf "$sm_path" &&
John Keeping091a6eb2013-06-16 15:18:18 +0100701 say "$(eval_gettext "Cleared directory '\$displaypath'")" ||
702 say "$(eval_gettext "Could not remove submodule work tree '\$displaypath'")"
Jens Lehmanncf419822013-03-04 22:20:24 +0100703 fi
704
John Keeping091a6eb2013-06-16 15:18:18 +0100705 mkdir "$sm_path" || say "$(eval_gettext "Could not create empty submodule directory '\$displaypath'")"
Jens Lehmanncf419822013-03-04 22:20:24 +0100706
707 # Remove the .git/config entries (unless the user already did it)
708 if test -n "$(git config --get-regexp submodule."$name\.")"
709 then
710 # Remove the whole section so we have a clean state when
711 # the user later decides to init this submodule again
712 url=$(git config submodule."$name".url)
713 git config --remove-section submodule."$name" 2>/dev/null &&
John Keeping091a6eb2013-06-16 15:18:18 +0100714 say "$(eval_gettext "Submodule '\$name' (\$url) unregistered for path '\$displaypath'")"
Jens Lehmanncf419822013-03-04 22:20:24 +0100715 fi
716 done
717}
718
719#
Lars Hjemli211b7f12007-06-06 11:13:02 +0200720# Update each submodule path to correct revision, using clone and checkout as needed
Lars Hjemli70c7ac22007-05-26 15:56:40 +0200721#
722# $@ = requested paths (default to all)
723#
Junio C Hamano23a485e2008-01-15 02:35:49 -0800724cmd_update()
Lars Hjemli70c7ac22007-05-26 15:56:40 +0200725{
Junio C Hamano5c08dbb2008-01-15 02:48:45 -0800726 # parse $args after "submodule ... update".
727 while test $# -ne 0
728 do
729 case "$1" in
730 -q|--quiet)
Stephen Boyd2e6a30e2009-06-16 15:33:00 -0700731 GIT_QUIET=1
Junio C Hamano5c08dbb2008-01-15 02:48:45 -0800732 ;;
Johannes Schindelinbe4d2c82008-05-16 11:23:03 +0100733 -i|--init)
Michael S. Tsirkind92a3952009-05-04 22:30:01 +0300734 init=1
Johannes Schindelinbe4d2c82008-05-16 11:23:03 +0100735 ;;
W. Trevor King06b1abb2012-12-19 11:03:32 -0500736 --remote)
737 remote=1
738 ;;
Fabian Franz31ca3ac2009-02-05 20:18:32 -0200739 -N|--no-fetch)
Fabian Franz31ca3ac2009-02-05 20:18:32 -0200740 nofetch=1
741 ;;
Nicolas Morey-Chaisemartin9db31bd2011-04-01 11:42:03 +0200742 -f|--force)
743 force=$1
744 ;;
Peter Huttererca2cedb2009-04-24 09:06:38 +1000745 -r|--rebase)
Johan Herland32948422009-06-03 08:27:06 +0200746 update="rebase"
Peter Huttererca2cedb2009-04-24 09:06:38 +1000747 ;;
Michael S. Tsirkind92a3952009-05-04 22:30:01 +0300748 --reference)
749 case "$2" in '') usage ;; esac
750 reference="--reference=$2"
Kevin Ballard98dbe632010-11-02 23:26:25 -0700751 shift
Michael S. Tsirkind92a3952009-05-04 22:30:01 +0300752 ;;
753 --reference=*)
754 reference="$1"
Michael S. Tsirkind92a3952009-05-04 22:30:01 +0300755 ;;
Johan Herland42b49172009-06-03 00:59:12 +0200756 -m|--merge)
Johan Herland42b49172009-06-03 00:59:12 +0200757 update="merge"
758 ;;
Johan Herlandb13fd5c2009-08-19 03:45:23 +0200759 --recursive)
Johan Herlandb13fd5c2009-08-19 03:45:23 +0200760 recursive=1
761 ;;
Junio C Hamanoefc5fb62011-10-10 15:56:16 -0700762 --checkout)
763 update="checkout"
764 ;;
Fredrik Gustafsson275cd182013-07-02 23:42:56 +0200765 --depth)
766 case "$2" in '') usage ;; esac
767 depth="--depth=$2"
768 shift
769 ;;
770 --depth=*)
771 depth=$1
772 ;;
Junio C Hamano5c08dbb2008-01-15 02:48:45 -0800773 --)
774 shift
775 break
776 ;;
777 -*)
778 usage
779 ;;
780 *)
781 break
782 ;;
783 esac
Kevin Ballard98dbe632010-11-02 23:26:25 -0700784 shift
Junio C Hamano5c08dbb2008-01-15 02:48:45 -0800785 done
786
Michael S. Tsirkind92a3952009-05-04 22:30:01 +0300787 if test -n "$init"
788 then
789 cmd_init "--" "$@" || return
790 fi
791
Spencer E. Olson1b4735d2011-02-17 09:18:45 -0700792 cloned_modules=
Fredrik Gustafsson15ffb7c2011-06-13 19:15:26 +0200793 module_list "$@" | {
794 err=
Ramsay Jones64394e32012-04-17 19:00:58 +0100795 while read mode sha1 stage sm_path
Lars Hjemli70c7ac22007-05-26 15:56:40 +0200796 do
Heiko Voigtbe9d0a32012-08-14 22:35:27 +0200797 die_if_unmatched "$mode"
Nicolas Morey-Chaisemartin313ee0d2011-03-30 07:20:02 +0200798 if test "$stage" = U
799 then
William Entriken75bf5e62013-03-02 14:44:59 -0500800 echo >&2 "Skipping unmerged submodule $prefix$sm_path"
Nicolas Morey-Chaisemartin313ee0d2011-03-30 07:20:02 +0200801 continue
802 fi
Ramsay Jones64394e32012-04-17 19:00:58 +0100803 name=$(module_name "$sm_path") || exit
Junio C Hamano5be60072007-07-02 22:52:14 -0700804 url=$(git config submodule."$name".url)
Junio C Hamanod851ffb2014-04-02 14:15:36 -0700805 branch=$(get_submodule_config "$name" branch master)
Junio C Hamanoefc5fb62011-10-10 15:56:16 -0700806 if ! test -z "$update"
807 then
808 update_module=$update
809 else
810 update_module=$(git config submodule."$name".update)
W. Trevor Kinga2aed082014-01-15 20:10:22 -0800811 if test -z "$update_module"
812 then
813 update_module="checkout"
814 fi
Junio C Hamanoefc5fb62011-10-10 15:56:16 -0700815 fi
816
John Keeping091a6eb2013-06-16 15:18:18 +0100817 displaypath=$(relative_path "$prefix$sm_path")
818
Junio C Hamanod851ffb2014-04-02 14:15:36 -0700819 if test "$update_module" = "none"
820 then
John Keeping091a6eb2013-06-16 15:18:18 +0100821 echo "Skipping submodule '$displaypath'"
Junio C Hamanoefc5fb62011-10-10 15:56:16 -0700822 continue
Junio C Hamanod851ffb2014-04-02 14:15:36 -0700823 fi
Junio C Hamanoefc5fb62011-10-10 15:56:16 -0700824
Lars Hjemli211b7f12007-06-06 11:13:02 +0200825 if test -z "$url"
Lars Hjemli70c7ac22007-05-26 15:56:40 +0200826 then
827 # Only mention uninitialized submodules when its
828 # path have been specified
829 test "$#" != "0" &&
John Keeping091a6eb2013-06-16 15:18:18 +0100830 say "$(eval_gettext "Submodule path '\$displaypath' not initialized
Ævar Arnfjörð Bjarmason1c2ef662011-05-21 18:44:08 +0000831Maybe you want to use 'update --init'?")"
Lars Hjemli211b7f12007-06-06 11:13:02 +0200832 continue
Lars Hjemli70c7ac22007-05-26 15:56:40 +0200833 fi
Lars Hjemli211b7f12007-06-06 11:13:02 +0200834
Elia Pinto496eeeb2014-06-10 05:28:33 -0700835 if ! test -d "$sm_path"/.git && ! test -f "$sm_path"/.git
Lars Hjemli211b7f12007-06-06 11:13:02 +0200836 then
Junio C Hamanod851ffb2014-04-02 14:15:36 -0700837 module_clone "$sm_path" "$name" "$url" "$reference" "$depth" || exit
Spencer E. Olson1b4735d2011-02-17 09:18:45 -0700838 cloned_modules="$cloned_modules;$name"
Lars Hjemlibf2d8242007-06-11 21:12:22 +0200839 subsha1=
840 else
Ramsay Jones64394e32012-04-17 19:00:58 +0100841 subsha1=$(clear_local_git_env; cd "$sm_path" &&
Junio C Hamano5be60072007-07-02 22:52:14 -0700842 git rev-parse --verify HEAD) ||
John Keeping091a6eb2013-06-16 15:18:18 +0100843 die "$(eval_gettext "Unable to find current revision in submodule path '\$displaypath'")"
Lars Hjemli211b7f12007-06-06 11:13:02 +0200844 fi
845
W. Trevor King06b1abb2012-12-19 11:03:32 -0500846 if test -n "$remote"
847 then
848 if test -z "$nofetch"
849 then
850 # Fetch remote before determining tracking $sha1
851 (clear_local_git_env; cd "$sm_path" && git-fetch) ||
852 die "$(eval_gettext "Unable to fetch in submodule path '\$sm_path'")"
853 fi
854 remote_name=$(clear_local_git_env; cd "$sm_path" && get_default_remote)
855 sha1=$(clear_local_git_env; cd "$sm_path" &&
856 git rev-parse --verify "${remote_name}/${branch}") ||
857 die "$(eval_gettext "Unable to find current ${remote_name}/${branch} revision in submodule path '\$sm_path'")"
858 fi
859
Elia Pinto496eeeb2014-06-10 05:28:33 -0700860 if test "$subsha1" != "$sha1" || test -n "$force"
Lars Hjemli70c7ac22007-05-26 15:56:40 +0200861 then
Nicolas Morey-Chaisemartin9db31bd2011-04-01 11:42:03 +0200862 subforce=$force
863 # If we don't already have a -f flag and the submodule has never been checked out
Elia Pinto496eeeb2014-06-10 05:28:33 -0700864 if test -z "$subsha1" && test -z "$force"
Ping Yinb9b378a2008-09-26 23:33:23 +0800865 then
Nicolas Morey-Chaisemartin9db31bd2011-04-01 11:42:03 +0200866 subforce="-f"
Ping Yinb9b378a2008-09-26 23:33:23 +0800867 fi
Fabian Franz31ca3ac2009-02-05 20:18:32 -0200868
869 if test -z "$nofetch"
870 then
Jens Lehmanne5f522d2011-03-06 23:13:36 +0100871 # Run fetch only if $sha1 isn't present or it
872 # is not reachable from a ref.
Ramsay Jones64394e32012-04-17 19:00:58 +0100873 (clear_local_git_env; cd "$sm_path" &&
Brandon Caseyf5799e02011-05-26 13:52:04 -0700874 ( (rev=$(git rev-list -n 1 $sha1 --not --all 2>/dev/null) &&
Jens Lehmanne5f522d2011-03-06 23:13:36 +0100875 test -z "$rev") || git-fetch)) ||
John Keeping091a6eb2013-06-16 15:18:18 +0100876 die "$(eval_gettext "Unable to fetch in submodule path '\$displaypath'")"
Fabian Franz31ca3ac2009-02-05 20:18:32 -0200877 fi
878
Spencer E. Olson1b4735d2011-02-17 09:18:45 -0700879 # Is this something we just cloned?
880 case ";$cloned_modules;" in
881 *";$name;"*)
882 # then there is no local change to integrate
Junio C Hamanod851ffb2014-04-02 14:15:36 -0700883 update_module=checkout ;;
Spencer E. Olson1b4735d2011-02-17 09:18:45 -0700884 esac
885
Junio C Hamano877449c2011-06-13 12:17:52 -0700886 must_die_on_failure=
Johan Herland32948422009-06-03 08:27:06 +0200887 case "$update_module" in
W. Trevor Kinga2aed082014-01-15 20:10:22 -0800888 checkout)
889 command="git checkout $subforce -q"
890 die_msg="$(eval_gettext "Unable to checkout '\$sha1' in submodule path '\$displaypath'")"
891 say_msg="$(eval_gettext "Submodule path '\$displaypath': checked out '\$sha1'")"
892 ;;
Johan Herland32948422009-06-03 08:27:06 +0200893 rebase)
894 command="git rebase"
John Keeping091a6eb2013-06-16 15:18:18 +0100895 die_msg="$(eval_gettext "Unable to rebase '\$sha1' in submodule path '\$displaypath'")"
896 say_msg="$(eval_gettext "Submodule path '\$displaypath': rebased into '\$sha1'")"
Junio C Hamano877449c2011-06-13 12:17:52 -0700897 must_die_on_failure=yes
Johan Herland32948422009-06-03 08:27:06 +0200898 ;;
Johan Herland42b49172009-06-03 00:59:12 +0200899 merge)
900 command="git merge"
John Keeping091a6eb2013-06-16 15:18:18 +0100901 die_msg="$(eval_gettext "Unable to merge '\$sha1' in submodule path '\$displaypath'")"
902 say_msg="$(eval_gettext "Submodule path '\$displaypath': merged in '\$sha1'")"
Junio C Hamano877449c2011-06-13 12:17:52 -0700903 must_die_on_failure=yes
Johan Herland42b49172009-06-03 00:59:12 +0200904 ;;
Chris Packham6cb57282013-07-03 21:02:02 +1200905 !*)
906 command="${update_module#!}"
Alex Henrieb80fa842015-08-26 22:26:19 -0600907 die_msg="$(eval_gettext "Execution of '\$command \$sha1' failed in submodule path '\$prefix\$sm_path'")"
Chris Packham6cb57282013-07-03 21:02:02 +1200908 say_msg="$(eval_gettext "Submodule path '\$prefix\$sm_path': '\$command \$sha1'")"
909 must_die_on_failure=yes
910 ;;
Johan Herland32948422009-06-03 08:27:06 +0200911 *)
W. Trevor Kinga2aed082014-01-15 20:10:22 -0800912 die "$(eval_gettext "Invalid update mode '$update_module' for submodule '$name'")"
Johan Herland32948422009-06-03 08:27:06 +0200913 esac
Lars Hjemli70c7ac22007-05-26 15:56:40 +0200914
Ramsay Jones64394e32012-04-17 19:00:58 +0100915 if (clear_local_git_env; cd "$sm_path" && $command "$sha1")
Fredrik Gustafsson15ffb7c2011-06-13 19:15:26 +0200916 then
Junio C Hamanoff968f02011-07-13 14:31:35 -0700917 say "$say_msg"
Junio C Hamano877449c2011-06-13 12:17:52 -0700918 elif test -n "$must_die_on_failure"
919 then
Junio C Hamanoff968f02011-07-13 14:31:35 -0700920 die_with_status 2 "$die_msg"
Fredrik Gustafsson15ffb7c2011-06-13 19:15:26 +0200921 else
Junio C Hamanoff968f02011-07-13 14:31:35 -0700922 err="${err};$die_msg"
Junio C Hamano877449c2011-06-13 12:17:52 -0700923 continue
Fredrik Gustafsson15ffb7c2011-06-13 19:15:26 +0200924 fi
Lars Hjemli70c7ac22007-05-26 15:56:40 +0200925 fi
Johan Herlandb13fd5c2009-08-19 03:45:23 +0200926
927 if test -n "$recursive"
928 then
William Entriken75bf5e62013-03-02 14:44:59 -0500929 (
930 prefix="$prefix$sm_path/"
931 clear_local_git_env
932 cd "$sm_path" &&
Jens Lehmann36141282013-11-11 21:55:52 +0100933 eval cmd_update
William Entriken75bf5e62013-03-02 14:44:59 -0500934 )
Fredrik Gustafsson15ffb7c2011-06-13 19:15:26 +0200935 res=$?
936 if test $res -gt 0
937 then
John Keeping091a6eb2013-06-16 15:18:18 +0100938 die_msg="$(eval_gettext "Failed to recurse into submodule path '\$displaypath'")"
Fredrik Gustafsson15ffb7c2011-06-13 19:15:26 +0200939 if test $res -eq 1
940 then
Junio C Hamanoff968f02011-07-13 14:31:35 -0700941 err="${err};$die_msg"
Fredrik Gustafsson15ffb7c2011-06-13 19:15:26 +0200942 continue
943 else
Junio C Hamanoff968f02011-07-13 14:31:35 -0700944 die_with_status $res "$die_msg"
Fredrik Gustafsson15ffb7c2011-06-13 19:15:26 +0200945 fi
946 fi
Johan Herlandb13fd5c2009-08-19 03:45:23 +0200947 fi
Lars Hjemli70c7ac22007-05-26 15:56:40 +0200948 done
Fredrik Gustafsson15ffb7c2011-06-13 19:15:26 +0200949
950 if test -n "$err"
951 then
952 OIFS=$IFS
953 IFS=';'
954 for e in $err
955 do
956 if test -n "$e"
957 then
958 echo >&2 "$e"
959 fi
960 done
961 IFS=$OIFS
962 exit 1
963 fi
964 }
Lars Hjemli70c7ac22007-05-26 15:56:40 +0200965}
966
Emil Medvebffe71f2007-06-26 18:40:58 -0500967set_name_rev () {
968 revname=$( (
Giuseppe Bilotta74ae1412010-02-25 00:34:17 +0100969 clear_local_git_env
Emil Medvebffe71f2007-06-26 18:40:58 -0500970 cd "$1" && {
Junio C Hamano5be60072007-07-02 22:52:14 -0700971 git describe "$2" 2>/dev/null ||
972 git describe --tags "$2" 2>/dev/null ||
Mark Levedahlf669ac02008-04-14 22:48:06 -0400973 git describe --contains "$2" 2>/dev/null ||
974 git describe --all --always "$2"
Emil Medvebffe71f2007-06-26 18:40:58 -0500975 }
976 ) )
977 test -z "$revname" || revname=" ($revname)"
978}
Ping Yin28f9af52008-03-11 21:52:15 +0800979#
980# Show commit summary for submodules in index or working tree
981#
982# If '--cached' is given, show summary between index and given commit,
983# or between working tree and given commit
984#
985# $@ = [commit (default 'HEAD'),] requested paths (default all)
986#
987cmd_summary() {
Ping Yinf2dc06a2008-03-11 21:52:17 +0800988 summary_limit=-1
Ping Yind0f64dd2008-04-12 23:05:31 +0800989 for_status=
Jens Lehmann1c244f62009-08-13 21:32:50 +0200990 diff_cmd=diff-index
Emil Medvebffe71f2007-06-26 18:40:58 -0500991
Ping Yin28f9af52008-03-11 21:52:15 +0800992 # parse $args after "submodule ... summary".
993 while test $# -ne 0
994 do
995 case "$1" in
996 --cached)
997 cached="$1"
998 ;;
Jens Lehmann1c244f62009-08-13 21:32:50 +0200999 --files)
1000 files="$1"
1001 ;;
Ping Yind0f64dd2008-04-12 23:05:31 +08001002 --for-status)
1003 for_status="$1"
1004 ;;
Ping Yinf2dc06a2008-03-11 21:52:17 +08001005 -n|--summary-limit)
René Scharfe862ae6c2013-04-01 15:06:27 +02001006 summary_limit="$2"
1007 isnumber "$summary_limit" || usage
Ping Yinf2dc06a2008-03-11 21:52:17 +08001008 shift
1009 ;;
René Scharfe862ae6c2013-04-01 15:06:27 +02001010 --summary-limit=*)
1011 summary_limit="${1#--summary-limit=}"
1012 isnumber "$summary_limit" || usage
1013 ;;
Ping Yin28f9af52008-03-11 21:52:15 +08001014 --)
1015 shift
1016 break
1017 ;;
1018 -*)
1019 usage
1020 ;;
1021 *)
1022 break
1023 ;;
1024 esac
1025 shift
1026 done
Lars Hjemli70c7ac22007-05-26 15:56:40 +02001027
Ping Yinf2dc06a2008-03-11 21:52:17 +08001028 test $summary_limit = 0 && return
1029
Johan Herland3deea892010-02-16 11:21:14 +01001030 if rev=$(git rev-parse -q --verify --default HEAD ${1+"$1"})
Ping Yin28f9af52008-03-11 21:52:15 +08001031 then
1032 head=$rev
Jeff Kingcaa9c3c2010-03-03 14:19:09 -08001033 test $# = 0 || shift
Elia Pinto496eeeb2014-06-10 05:28:33 -07001034 elif test -z "$1" || test "$1" = "HEAD"
Johan Herland3deea892010-02-16 11:21:14 +01001035 then
Junio C Hamano14e940d2010-03-03 14:19:10 -08001036 # before the first commit: compare with an empty tree
1037 head=$(git hash-object -w -t tree --stdin </dev/null)
Jens Lehmann2ea6c2c2010-03-09 15:55:32 +01001038 test -z "$1" || shift
Ping Yin28f9af52008-03-11 21:52:15 +08001039 else
Johan Herland3deea892010-02-16 11:21:14 +01001040 head="HEAD"
Ping Yin28f9af52008-03-11 21:52:15 +08001041 fi
1042
Jens Lehmann1c244f62009-08-13 21:32:50 +02001043 if [ -n "$files" ]
1044 then
1045 test -n "$cached" &&
Jiang Xin465d6a02012-07-25 22:53:09 +08001046 die "$(gettext "The --cached option cannot be used with the --files option")"
Jens Lehmann1c244f62009-08-13 21:32:50 +02001047 diff_cmd=diff-files
1048 head=
1049 fi
1050
Ping Yin28f9af52008-03-11 21:52:15 +08001051 cd_to_toplevel
John Keeping091a6eb2013-06-16 15:18:18 +01001052 eval "set $(git rev-parse --sq --prefix "$wt_prefix" -- "$@")"
Ping Yin28f9af52008-03-11 21:52:15 +08001053 # Get modified modules cared by user
Jens Lehmann18076502010-06-25 16:56:02 +02001054 modules=$(git $diff_cmd $cached --ignore-submodules=dirty --raw $head -- "$@" |
Junio C Hamanoe1622bf2009-11-23 15:56:32 -08001055 sane_egrep '^:([0-7]* )?160000' |
Brian M. Carlson2be94502013-08-17 17:25:42 +00001056 while read mod_src mod_dst sha1_src sha1_dst status sm_path
Ping Yin28f9af52008-03-11 21:52:15 +08001057 do
1058 # Always show modules deleted or type-changed (blob<->module)
Elia Pinto496eeeb2014-06-10 05:28:33 -07001059 if test "$status" = D || test "$status" = T
1060 then
Junio C Hamano6a066232014-06-10 08:33:39 -07001061 printf '%s\n' "$sm_path"
Elia Pinto496eeeb2014-06-10 05:28:33 -07001062 continue
1063 fi
Brian M. Carlson927b26f2013-09-01 20:06:49 +00001064 # Respect the ignore setting for --for-status.
1065 if test -n "$for_status"
1066 then
1067 name=$(module_name "$sm_path")
1068 ignore_config=$(get_submodule_config "$name" ignore none)
Elia Pinto496eeeb2014-06-10 05:28:33 -07001069 test $status != A && test $ignore_config = all && continue
Brian M. Carlson927b26f2013-09-01 20:06:49 +00001070 fi
Ping Yin28f9af52008-03-11 21:52:15 +08001071 # Also show added or modified modules which are checked out
Brian M. Carlson2be94502013-08-17 17:25:42 +00001072 GIT_DIR="$sm_path/.git" git-rev-parse --git-dir >/dev/null 2>&1 &&
Junio C Hamano6a066232014-06-10 08:33:39 -07001073 printf '%s\n' "$sm_path"
Ping Yin28f9af52008-03-11 21:52:15 +08001074 done
1075 )
Ping Yin1cb639e2008-03-11 21:52:16 +08001076
Ping Yind0f64dd2008-04-12 23:05:31 +08001077 test -z "$modules" && return
1078
Jens Lehmann18076502010-06-25 16:56:02 +02001079 git $diff_cmd $cached --ignore-submodules=dirty --raw $head -- $modules |
Junio C Hamanoe1622bf2009-11-23 15:56:32 -08001080 sane_egrep '^:([0-7]* )?160000' |
Ping Yin1cb639e2008-03-11 21:52:16 +08001081 cut -c2- |
1082 while read mod_src mod_dst sha1_src sha1_dst status name
1083 do
1084 if test -z "$cached" &&
1085 test $sha1_dst = 0000000000000000000000000000000000000000
1086 then
1087 case "$mod_dst" in
1088 160000)
1089 sha1_dst=$(GIT_DIR="$name/.git" git rev-parse HEAD)
1090 ;;
1091 100644 | 100755 | 120000)
1092 sha1_dst=$(git hash-object $name)
1093 ;;
1094 000000)
1095 ;; # removed
1096 *)
1097 # unexpected type
Jon Seymour6ff875c2011-08-07 21:58:17 +10001098 eval_gettextln "unexpected mode \$mod_dst" >&2
Ping Yin1cb639e2008-03-11 21:52:16 +08001099 continue ;;
1100 esac
1101 fi
1102 missing_src=
1103 missing_dst=
1104
1105 test $mod_src = 160000 &&
Miklos Vajna30353a42008-12-03 14:26:52 +01001106 ! GIT_DIR="$name/.git" git-rev-parse -q --verify $sha1_src^0 >/dev/null &&
Ping Yin1cb639e2008-03-11 21:52:16 +08001107 missing_src=t
1108
1109 test $mod_dst = 160000 &&
Miklos Vajna30353a42008-12-03 14:26:52 +01001110 ! GIT_DIR="$name/.git" git-rev-parse -q --verify $sha1_dst^0 >/dev/null &&
Ping Yin1cb639e2008-03-11 21:52:16 +08001111 missing_dst=t
1112
John Keeping091a6eb2013-06-16 15:18:18 +01001113 display_name=$(relative_path "$name")
1114
Ping Yin1cb639e2008-03-11 21:52:16 +08001115 total_commits=
1116 case "$missing_src,$missing_dst" in
1117 t,)
John Keeping091a6eb2013-06-16 15:18:18 +01001118 errmsg="$(eval_gettext " Warn: \$display_name doesn't contain commit \$sha1_src")"
Ping Yin1cb639e2008-03-11 21:52:16 +08001119 ;;
1120 ,t)
John Keeping091a6eb2013-06-16 15:18:18 +01001121 errmsg="$(eval_gettext " Warn: \$display_name doesn't contain commit \$sha1_dst")"
Ping Yin1cb639e2008-03-11 21:52:16 +08001122 ;;
1123 t,t)
John Keeping091a6eb2013-06-16 15:18:18 +01001124 errmsg="$(eval_gettext " Warn: \$display_name doesn't contain commits \$sha1_src and \$sha1_dst")"
Ping Yin1cb639e2008-03-11 21:52:16 +08001125 ;;
1126 *)
1127 errmsg=
1128 total_commits=$(
Elia Pinto496eeeb2014-06-10 05:28:33 -07001129 if test $mod_src = 160000 && test $mod_dst = 160000
Ping Yin1cb639e2008-03-11 21:52:16 +08001130 then
1131 range="$sha1_src...$sha1_dst"
1132 elif test $mod_src = 160000
1133 then
1134 range=$sha1_src
1135 else
1136 range=$sha1_dst
1137 fi
1138 GIT_DIR="$name/.git" \
Jeff Kingb0e621a2010-04-08 15:42:37 -04001139 git rev-list --first-parent $range -- | wc -l
Ping Yin1cb639e2008-03-11 21:52:16 +08001140 )
Johannes Sixteed35592008-03-12 09:30:01 +01001141 total_commits=" ($(($total_commits + 0)))"
Ping Yin1cb639e2008-03-11 21:52:16 +08001142 ;;
1143 esac
1144
1145 sha1_abbr_src=$(echo $sha1_src | cut -c1-7)
1146 sha1_abbr_dst=$(echo $sha1_dst | cut -c1-7)
1147 if test $status = T
1148 then
Ævar Arnfjörð Bjarmasonb3e73442011-05-21 18:44:09 +00001149 blob="$(gettext "blob")"
1150 submodule="$(gettext "submodule")"
Ping Yin1cb639e2008-03-11 21:52:16 +08001151 if test $mod_dst = 160000
1152 then
John Keeping091a6eb2013-06-16 15:18:18 +01001153 echo "* $display_name $sha1_abbr_src($blob)->$sha1_abbr_dst($submodule)$total_commits:"
Ping Yin1cb639e2008-03-11 21:52:16 +08001154 else
John Keeping091a6eb2013-06-16 15:18:18 +01001155 echo "* $display_name $sha1_abbr_src($submodule)->$sha1_abbr_dst($blob)$total_commits:"
Ping Yin1cb639e2008-03-11 21:52:16 +08001156 fi
1157 else
John Keeping091a6eb2013-06-16 15:18:18 +01001158 echo "* $display_name $sha1_abbr_src...$sha1_abbr_dst$total_commits:"
Ping Yin1cb639e2008-03-11 21:52:16 +08001159 fi
1160 if test -n "$errmsg"
1161 then
1162 # Don't give error msg for modification whose dst is not submodule
1163 # i.e. deleted or changed to blob
1164 test $mod_dst = 160000 && echo "$errmsg"
1165 else
Elia Pinto496eeeb2014-06-10 05:28:33 -07001166 if test $mod_src = 160000 && test $mod_dst = 160000
Ping Yin1cb639e2008-03-11 21:52:16 +08001167 then
Ping Yinf2dc06a2008-03-11 21:52:17 +08001168 limit=
1169 test $summary_limit -gt 0 && limit="-$summary_limit"
Ping Yin1cb639e2008-03-11 21:52:16 +08001170 GIT_DIR="$name/.git" \
Ping Yinf2dc06a2008-03-11 21:52:17 +08001171 git log $limit --pretty='format: %m %s' \
Ping Yin1cb639e2008-03-11 21:52:16 +08001172 --first-parent $sha1_src...$sha1_dst
1173 elif test $mod_dst = 160000
1174 then
1175 GIT_DIR="$name/.git" \
1176 git log --pretty='format: > %s' -1 $sha1_dst
1177 else
1178 GIT_DIR="$name/.git" \
1179 git log --pretty='format: < %s' -1 $sha1_src
1180 fi
1181 echo
1182 fi
1183 echo
Matthieu Moy3ba74072013-09-06 19:43:06 +02001184 done
Ping Yin28f9af52008-03-11 21:52:15 +08001185}
Lars Hjemli70c7ac22007-05-26 15:56:40 +02001186#
Lars Hjemli941987a2007-06-11 21:12:24 +02001187# List all submodules, prefixed with:
Lars Hjemli70c7ac22007-05-26 15:56:40 +02001188# - submodule not initialized
1189# + different revision checked out
1190#
1191# If --cached was specified the revision in the index will be printed
1192# instead of the currently checked out revision.
1193#
1194# $@ = requested paths (default to all)
1195#
Junio C Hamano23a485e2008-01-15 02:35:49 -08001196cmd_status()
Lars Hjemli70c7ac22007-05-26 15:56:40 +02001197{
Junio C Hamano5c08dbb2008-01-15 02:48:45 -08001198 # parse $args after "submodule ... status".
1199 while test $# -ne 0
1200 do
1201 case "$1" in
1202 -q|--quiet)
Stephen Boyd2e6a30e2009-06-16 15:33:00 -07001203 GIT_QUIET=1
Junio C Hamano5c08dbb2008-01-15 02:48:45 -08001204 ;;
1205 --cached)
1206 cached=1
1207 ;;
Johan Herland64b19ff2009-08-19 03:45:24 +02001208 --recursive)
1209 recursive=1
1210 ;;
Junio C Hamano5c08dbb2008-01-15 02:48:45 -08001211 --)
1212 shift
1213 break
1214 ;;
1215 -*)
1216 usage
1217 ;;
1218 *)
1219 break
1220 ;;
1221 esac
1222 shift
1223 done
1224
David Aguilara7b32692008-08-22 00:30:50 -07001225 module_list "$@" |
Ramsay Jones64394e32012-04-17 19:00:58 +01001226 while read mode sha1 stage sm_path
Lars Hjemli70c7ac22007-05-26 15:56:40 +02001227 do
Heiko Voigtbe9d0a32012-08-14 22:35:27 +02001228 die_if_unmatched "$mode"
Ramsay Jones64394e32012-04-17 19:00:58 +01001229 name=$(module_name "$sm_path") || exit
Junio C Hamano5be60072007-07-02 22:52:14 -07001230 url=$(git config submodule."$name".url)
John Keeping091a6eb2013-06-16 15:18:18 +01001231 displaypath=$(relative_path "$prefix$sm_path")
Nicolas Morey-Chaisemartin313ee0d2011-03-30 07:20:02 +02001232 if test "$stage" = U
1233 then
1234 say "U$sha1 $displaypath"
1235 continue
1236 fi
Elia Pinto496eeeb2014-06-10 05:28:33 -07001237 if test -z "$url" ||
1238 {
1239 ! test -d "$sm_path"/.git &&
1240 ! test -f "$sm_path"/.git
1241 }
Lars Hjemli70c7ac22007-05-26 15:56:40 +02001242 then
Johan Herland64b19ff2009-08-19 03:45:24 +02001243 say "-$sha1 $displaypath"
Lars Hjemli70c7ac22007-05-26 15:56:40 +02001244 continue;
1245 fi
Ramsay Jones64394e32012-04-17 19:00:58 +01001246 if git diff-files --ignore-submodules=dirty --quiet -- "$sm_path"
Lars Hjemli70c7ac22007-05-26 15:56:40 +02001247 then
Fredrik Gustafssonb545cd12013-06-17 11:55:36 +02001248 set_name_rev "$sm_path" "$sha1"
Johan Herland64b19ff2009-08-19 03:45:24 +02001249 say " $sha1 $displaypath$revname"
Lars Hjemli70c7ac22007-05-26 15:56:40 +02001250 else
1251 if test -z "$cached"
1252 then
Ramsay Jones64394e32012-04-17 19:00:58 +01001253 sha1=$(clear_local_git_env; cd "$sm_path" && git rev-parse --verify HEAD)
Lars Hjemli70c7ac22007-05-26 15:56:40 +02001254 fi
Fredrik Gustafssonb545cd12013-06-17 11:55:36 +02001255 set_name_rev "$sm_path" "$sha1"
Johan Herland64b19ff2009-08-19 03:45:24 +02001256 say "+$sha1 $displaypath$revname"
1257 fi
1258
1259 if test -n "$recursive"
1260 then
1261 (
1262 prefix="$displaypath/"
Giuseppe Bilotta74ae1412010-02-25 00:34:17 +01001263 clear_local_git_env
Ramsay Jones64394e32012-04-17 19:00:58 +01001264 cd "$sm_path" &&
Jens Lehmanne15bec02012-10-28 22:37:16 +01001265 eval cmd_status
Johan Herland64b19ff2009-08-19 03:45:24 +02001266 ) ||
Ramsay Jones64394e32012-04-17 19:00:58 +01001267 die "$(eval_gettext "Failed to recurse into submodule path '\$sm_path'")"
Lars Hjemli70c7ac22007-05-26 15:56:40 +02001268 fi
1269 done
1270}
David Aguilar2327f612008-08-24 12:43:37 -07001271#
1272# Sync remote urls for submodules
1273# This makes the value for remote.$remote.url match the value
1274# specified in .gitmodules.
1275#
1276cmd_sync()
1277{
1278 while test $# -ne 0
1279 do
1280 case "$1" in
1281 -q|--quiet)
Stephen Boyd2e6a30e2009-06-16 15:33:00 -07001282 GIT_QUIET=1
David Aguilar2327f612008-08-24 12:43:37 -07001283 shift
1284 ;;
Phil Hord82f49f22012-10-26 15:44:42 -04001285 --recursive)
1286 recursive=1
1287 shift
1288 ;;
David Aguilar2327f612008-08-24 12:43:37 -07001289 --)
1290 shift
1291 break
1292 ;;
1293 -*)
1294 usage
1295 ;;
1296 *)
1297 break
1298 ;;
1299 esac
1300 done
1301 cd_to_toplevel
1302 module_list "$@" |
Ramsay Jones64394e32012-04-17 19:00:58 +01001303 while read mode sha1 stage sm_path
David Aguilar2327f612008-08-24 12:43:37 -07001304 do
Heiko Voigtbe9d0a32012-08-14 22:35:27 +02001305 die_if_unmatched "$mode"
Ramsay Jones64394e32012-04-17 19:00:58 +01001306 name=$(module_name "$sm_path")
David Aguilar2327f612008-08-24 12:43:37 -07001307 url=$(git config -f .gitmodules --get submodule."$name".url)
Johan Herlandbaede9f2008-09-22 18:08:31 +02001308
1309 # Possibly a url relative to parent
1310 case "$url" in
1311 ./*|../*)
Jon Seymour967b2c62012-06-06 21:57:29 +10001312 # rewrite foo/bar as ../.. to find path from
1313 # submodule work tree to superproject work tree
Junio C Hamano6a066232014-06-10 08:33:39 -07001314 up_path="$(printf '%s\n' "$sm_path" | sed "s/[^/][^/]*/../g")" &&
Jon Seymour967b2c62012-06-06 21:57:29 +10001315 # guarantee a trailing /
1316 up_path=${up_path%/}/ &&
1317 # path from submodule work tree to submodule origin repo
1318 sub_origin_url=$(resolve_relative_url "$url" "$up_path") &&
1319 # path from superproject work tree to submodule origin repo
1320 super_config_url=$(resolve_relative_url "$url") || exit
1321 ;;
1322 *)
1323 sub_origin_url="$url"
1324 super_config_url="$url"
Johan Herlandbaede9f2008-09-22 18:08:31 +02001325 ;;
1326 esac
1327
Junio C Hamanoccee6082011-06-25 22:41:25 +02001328 if git config "submodule.$name.url" >/dev/null 2>/dev/null
David Aguilar2327f612008-08-24 12:43:37 -07001329 then
John Keeping091a6eb2013-06-16 15:18:18 +01001330 displaypath=$(relative_path "$prefix$sm_path")
1331 say "$(eval_gettext "Synchronizing submodule url for '\$displaypath'")"
Jon Seymour967b2c62012-06-06 21:57:29 +10001332 git config submodule."$name".url "$super_config_url"
Junio C Hamanoccee6082011-06-25 22:41:25 +02001333
Ramsay Jones64394e32012-04-17 19:00:58 +01001334 if test -e "$sm_path"/.git
Junio C Hamanoccee6082011-06-25 22:41:25 +02001335 then
1336 (
1337 clear_local_git_env
Ramsay Jones64394e32012-04-17 19:00:58 +01001338 cd "$sm_path"
Junio C Hamanoccee6082011-06-25 22:41:25 +02001339 remote=$(get_default_remote)
Jon Seymour967b2c62012-06-06 21:57:29 +10001340 git config remote."$remote".url "$sub_origin_url"
Phil Hord82f49f22012-10-26 15:44:42 -04001341
1342 if test -n "$recursive"
1343 then
1344 prefix="$prefix$sm_path/"
1345 eval cmd_sync
1346 fi
Junio C Hamanoccee6082011-06-25 22:41:25 +02001347 )
1348 fi
David Aguilar2327f612008-08-24 12:43:37 -07001349 fi
1350 done
1351}
Lars Hjemli70c7ac22007-05-26 15:56:40 +02001352
Junio C Hamano5c08dbb2008-01-15 02:48:45 -08001353# This loop parses the command line arguments to find the
1354# subcommand name to dispatch. Parsing of the subcommand specific
1355# options are primarily done by the subcommand implementations.
1356# Subcommand specific options such as --branch and --cached are
1357# parsed here as well, for backward compatibility.
1358
1359while test $# != 0 && test -z "$command"
Lars Hjemli70c7ac22007-05-26 15:56:40 +02001360do
1361 case "$1" in
Jens Lehmanncf419822013-03-04 22:20:24 +01001362 add | foreach | init | deinit | update | status | summary | sync)
Junio C Hamano5c08dbb2008-01-15 02:48:45 -08001363 command=$1
Lars Hjemli70c7ac22007-05-26 15:56:40 +02001364 ;;
1365 -q|--quiet)
Stephen Boyd2e6a30e2009-06-16 15:33:00 -07001366 GIT_QUIET=1
Lars Hjemli70c7ac22007-05-26 15:56:40 +02001367 ;;
Sven Verdoolaegeecda0722007-06-24 23:06:07 +02001368 -b|--branch)
1369 case "$2" in
1370 '')
1371 usage
1372 ;;
1373 esac
1374 branch="$2"; shift
1375 ;;
Lars Hjemli70c7ac22007-05-26 15:56:40 +02001376 --cached)
Ping Yin28f9af52008-03-11 21:52:15 +08001377 cached="$1"
Lars Hjemli70c7ac22007-05-26 15:56:40 +02001378 ;;
1379 --)
1380 break
1381 ;;
1382 -*)
1383 usage
1384 ;;
1385 *)
1386 break
1387 ;;
1388 esac
1389 shift
1390done
1391
Junio C Hamano5c08dbb2008-01-15 02:48:45 -08001392# No command word defaults to "status"
Ramkumar Ramachandraaf9c9f92012-09-22 16:57:59 +05301393if test -z "$command"
1394then
1395 if test $# = 0
1396 then
1397 command=status
1398 else
1399 usage
1400 fi
1401fi
Sven Verdoolaegeecda0722007-06-24 23:06:07 +02001402
Junio C Hamano5c08dbb2008-01-15 02:48:45 -08001403# "-b branch" is accepted only by "add"
1404if test -n "$branch" && test "$command" != add
1405then
Lars Hjemli70c7ac22007-05-26 15:56:40 +02001406 usage
Junio C Hamano5c08dbb2008-01-15 02:48:45 -08001407fi
1408
Ping Yin28f9af52008-03-11 21:52:15 +08001409# "--cached" is accepted only by "status" and "summary"
Elia Pinto496eeeb2014-06-10 05:28:33 -07001410if test -n "$cached" && test "$command" != status && test "$command" != summary
Junio C Hamano5c08dbb2008-01-15 02:48:45 -08001411then
1412 usage
1413fi
1414
1415"cmd_$command" "$@"