]>
Commit | Line | Data |
---|---|---|
70c7ac22 LH |
1 | #!/bin/sh |
2 | # | |
4c8a9db6 | 3 | # git-submodule.sh: add, init, update or list git submodules |
70c7ac22 LH |
4 | # |
5 | # Copyright (c) 2007 Lars Hjemli | |
6 | ||
1d5bec8b | 7 | dashless=$(basename "$0" | sed -e 's/-/ /') |
68cabbfd DL |
8 | USAGE="[--quiet] [--cached] |
9 | or: $dashless [--quiet] add [-b <branch>] [-f|--force] [--name <name>] [--reference <repository>] [--] <repository> [<path>] | |
64b19ffe | 10 | or: $dashless [--quiet] status [--cached] [--recursive] [--] [<path>...] |
1d5bec8b | 11 | or: $dashless [--quiet] init [--] [<path>...] |
f6a52799 | 12 | or: $dashless [--quiet] deinit [-f|--force] (--all| [--] <path>...) |
132f600b | 13 | or: $dashless [--quiet] update [--init] [--remote] [-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-shallow] [--reference <repository>] [--recursive] [--[no-]single-branch] [--] [<path>...] |
b57e8119 | 14 | or: $dashless [--quiet] set-branch (--default|--branch <branch>) [--] <path> |
26b06100 | 15 | or: $dashless [--quiet] set-url [--] <path> <newurl> |
adc54235 | 16 | or: $dashless [--quiet] summary [--cached|--files] [--summary-limit <n>] [commit] [--] [<path>...] |
15fc56a8 | 17 | or: $dashless [--quiet] foreach [--recursive] <command> |
c32eaa8a SB |
18 | or: $dashless [--quiet] sync [--recursive] [--] [<path>...] |
19 | or: $dashless [--quiet] absorbgitdirs [--] [<path>...]" | |
8f321a39 | 20 | OPTIONS_SPEC= |
091a6eb0 | 21 | SUBDIRECTORY_OK=Yes |
70c7ac22 LH |
22 | . git-sh-setup |
23 | require_work_tree | |
091a6eb0 JK |
24 | wt_prefix=$(git rev-parse --show-prefix) |
25 | cd_to_toplevel | |
70c7ac22 | 26 | |
f1762d77 BW |
27 | # Tell the rest of git that any URLs we get don't come |
28 | # directly from the user, so it can apply policy as appropriate. | |
29 | GIT_PROTOCOL_FROM_USER=0 | |
30 | export GIT_PROTOCOL_FROM_USER | |
33cfccbb | 31 | |
5c08dbbd | 32 | command= |
ecda0723 | 33 | branch= |
d27b876b | 34 | force= |
d92a3959 | 35 | reference= |
70c7ac22 | 36 | cached= |
48bb3033 GP |
37 | recursive= |
38 | init= | |
0060fd15 | 39 | require_init= |
1c244f6e | 40 | files= |
06b1abb5 | 41 | remote= |
31ca3ac3 | 42 | nofetch= |
32948425 | 43 | update= |
15fc56a8 | 44 | prefix= |
73b0898d | 45 | custom_name= |
275cd184 | 46 | depth= |
72c5f883 | 47 | progress= |
a0ef2934 | 48 | dissociate= |
132f600b | 49 | single_branch= |
65d100c4 LX |
50 | jobs= |
51 | recommend_shallow= | |
70c7ac22 | 52 | |
be9d0a3a HV |
53 | die_if_unmatched () |
54 | { | |
55 | if test "$1" = "#unmatched" | |
56 | then | |
c4c02bf1 | 57 | exit ${2:-1} |
be9d0a3a HV |
58 | fi |
59 | } | |
60 | ||
862ae6cd RS |
61 | isnumber() |
62 | { | |
63 | n=$(($1 + 0)) 2>/dev/null && test "$n" = "$1" | |
64 | } | |
65 | ||
dda63468 | 66 | # Given a full hex object ID, is this the zero OID? |
67 | is_zero_oid () { | |
68 | echo "$1" | sane_egrep '^0+$' >/dev/null 2>&1 | |
69 | } | |
70 | ||
14111fc4 JK |
71 | # Sanitize the local git environment for use within a submodule. We |
72 | # can't simply use clear_local_git_env since we want to preserve some | |
73 | # of the settings from GIT_CONFIG_PARAMETERS. | |
74 | sanitize_submodule_env() | |
75 | { | |
89044baa | 76 | save_config=$GIT_CONFIG_PARAMETERS |
14111fc4 | 77 | clear_local_git_env |
89044baa | 78 | GIT_CONFIG_PARAMETERS=$save_config |
860cba61 | 79 | export GIT_CONFIG_PARAMETERS |
14111fc4 JK |
80 | } |
81 | ||
ecda0723 SV |
82 | # |
83 | # Add a new submodule to the working tree, .gitmodules and the index | |
84 | # | |
ec05df35 | 85 | # $@ = repo path |
ecda0723 SV |
86 | # |
87 | # optional branch is stored in global branch variable | |
88 | # | |
23a485e3 | 89 | cmd_add() |
ecda0723 | 90 | { |
5c08dbbd | 91 | # parse $args after "submodule ... add". |
091a6eb0 | 92 | reference_path= |
5c08dbbd JH |
93 | while test $# -ne 0 |
94 | do | |
95 | case "$1" in | |
96 | -b | --branch) | |
97 | case "$2" in '') usage ;; esac | |
98 | branch=$2 | |
99 | shift | |
100 | ;; | |
d27b876b JL |
101 | -f | --force) |
102 | force=$1 | |
103 | ;; | |
5c08dbbd | 104 | -q|--quiet) |
2e6a30ef | 105 | GIT_QUIET=1 |
5c08dbbd | 106 | ;; |
6d33e1c2 CF |
107 | --progress) |
108 | progress=1 | |
109 | ;; | |
d92a3959 MT |
110 | --reference) |
111 | case "$2" in '') usage ;; esac | |
091a6eb0 | 112 | reference_path=$2 |
d92a3959 MT |
113 | shift |
114 | ;; | |
115 | --reference=*) | |
091a6eb0 | 116 | reference_path="${1#--reference=}" |
d92a3959 | 117 | ;; |
a0ef2934 CF |
118 | --dissociate) |
119 | dissociate=1 | |
120 | ;; | |
73b0898d JL |
121 | --name) |
122 | case "$2" in '') usage ;; esac | |
123 | custom_name=$2 | |
124 | shift | |
125 | ;; | |
275cd184 FG |
126 | --depth) |
127 | case "$2" in '') usage ;; esac | |
128 | depth="--depth=$2" | |
129 | shift | |
130 | ;; | |
131 | --depth=*) | |
132 | depth=$1 | |
133 | ;; | |
5c08dbbd JH |
134 | --) |
135 | shift | |
136 | break | |
137 | ;; | |
138 | -*) | |
139 | usage | |
140 | ;; | |
141 | *) | |
142 | break | |
143 | ;; | |
144 | esac | |
145 | shift | |
146 | done | |
147 | ||
76e9bdc4 AO |
148 | if ! git submodule--helper config --check-writeable >/dev/null 2>&1 |
149 | then | |
150 | die "$(eval_gettext "please make sure that the .gitmodules file is in the working tree")" | |
151 | fi | |
152 | ||
091a6eb0 JK |
153 | if test -n "$reference_path" |
154 | then | |
155 | is_absolute_path "$reference_path" || | |
156 | reference_path="$wt_prefix$reference_path" | |
157 | ||
158 | reference="--reference=$reference_path" | |
159 | fi | |
160 | ||
ecda0723 | 161 | repo=$1 |
64394e3a | 162 | sm_path=$2 |
ecda0723 | 163 | |
64394e3a | 164 | if test -z "$sm_path"; then |
6a066230 | 165 | sm_path=$(printf '%s\n' "$repo" | |
1414e578 JL |
166 | sed -e 's|/$||' -e 's|:*/*\.git$||' -e 's|.*[/:]||g') |
167 | fi | |
168 | ||
496eeeb1 | 169 | if test -z "$repo" || test -z "$sm_path"; then |
ecda0723 SV |
170 | usage |
171 | fi | |
172 | ||
091a6eb0 JK |
173 | is_absolute_path "$sm_path" || sm_path="$wt_prefix$sm_path" |
174 | ||
ec05df35 ML |
175 | # assure repo is absolute or relative to parent |
176 | case "$repo" in | |
177 | ./*|../*) | |
091a6eb0 JK |
178 | test -z "$wt_prefix" || |
179 | die "$(gettext "Relative path can only be used from the toplevel of the working tree")" | |
180 | ||
ec05df35 | 181 | # dereference source url relative to parent's url |
63e95beb | 182 | realrepo=$(git submodule--helper resolve-relative-url "$repo") || exit |
ec05df35 ML |
183 | ;; |
184 | *:*|/*) | |
185 | # absolute url | |
186 | realrepo=$repo | |
187 | ;; | |
188 | *) | |
497ee872 | 189 | die "$(eval_gettext "repo URL: '\$repo' must be absolute or begin with ./|../")" |
ec05df35 ML |
190 | ;; |
191 | esac | |
192 | ||
db75ada5 MG |
193 | # normalize path: |
194 | # multiple //; leading ./; /./; /../; trailing / | |
64394e3a | 195 | sm_path=$(printf '%s/\n' "$sm_path" | |
db75ada5 MG |
196 | sed -e ' |
197 | s|//*|/|g | |
198 | s|^\(\./\)*|| | |
8196e728 | 199 | s|/\(\./\)*|/|g |
db75ada5 MG |
200 | :start |
201 | s|\([^/]*\)/\.\./|| | |
202 | tstart | |
203 | s|/*$|| | |
204 | ') | |
619acfc7 SB |
205 | if test -z "$force" |
206 | then | |
207 | git ls-files --error-unmatch "$sm_path" > /dev/null 2>&1 && | |
208 | die "$(eval_gettext "'\$sm_path' already exists in the index")" | |
209 | else | |
210 | git ls-files -s "$sm_path" | sane_grep -v "^160000" > /dev/null 2>&1 && | |
211 | die "$(eval_gettext "'\$sm_path' already exists in the index and is not a submodule")" | |
212 | fi | |
ecda0723 | 213 | |
e1381118 KM |
214 | if test -d "$sm_path" && |
215 | test -z $(git -C "$sm_path" rev-parse --show-cdup 2>/dev/null) | |
216 | then | |
217 | git -C "$sm_path" rev-parse --verify -q HEAD >/dev/null || | |
218 | die "$(eval_gettext "'\$sm_path' does not have a commit checked out")" | |
219 | fi | |
220 | ||
c8163854 | 221 | if test -z "$force" |
d27b876b | 222 | then |
c8163854 KM |
223 | dryerr=$(git add --dry-run --ignore-missing --no-warn-embedded-repo "$sm_path" 2>&1 >/dev/null) |
224 | res=$? | |
225 | if test $res -ne 0 | |
226 | then | |
227 | echo >&2 "$dryerr" | |
228 | exit $res | |
229 | fi | |
d27b876b JL |
230 | fi |
231 | ||
73b0898d JL |
232 | if test -n "$custom_name" |
233 | then | |
234 | sm_name="$custom_name" | |
235 | else | |
236 | sm_name="$sm_path" | |
237 | fi | |
238 | ||
0383bbb9 JK |
239 | if ! git submodule--helper check-name "$sm_name" |
240 | then | |
241 | die "$(eval_gettext "'$sm_name' is not a valid submodule name")" | |
242 | fi | |
243 | ||
d4264ca3 | 244 | # perhaps the path exists and is already a git repo, else clone it |
64394e3a | 245 | if test -e "$sm_path" |
d4264ca3 | 246 | then |
496eeeb1 | 247 | if test -d "$sm_path"/.git || test -f "$sm_path"/.git |
d4264ca3 | 248 | then |
64394e3a | 249 | eval_gettextln "Adding existing repo at '\$sm_path' to the index" |
d4264ca3 | 250 | else |
64394e3a | 251 | die "$(eval_gettext "'\$sm_path' already exists and is not a valid git repo")" |
d4264ca3 | 252 | fi |
c2f93917 | 253 | |
d4264ca3 | 254 | else |
4b7c286e JL |
255 | if test -d ".git/modules/$sm_name" |
256 | then | |
257 | if test -z "$force" | |
258 | then | |
0d71dbfd | 259 | eval_gettextln >&2 "A git directory for '\$sm_name' is found locally with remote(s):" |
4b7c286e | 260 | GIT_DIR=".git/modules/$sm_name" GIT_WORK_TREE=. git remote -v | grep '(fetch)' | sed -e s,^," ", -e s,' (fetch)',, >&2 |
0d71dbfd VA |
261 | die "$(eval_gettextln "\ |
262 | If you want to reuse this local git directory instead of cloning again from | |
263 | \$realrepo | |
264 | use the '--force' option. If the local git directory is not the correct repo | |
265 | or you are unsure what this means choose another name with the '--name' option.")" | |
4b7c286e | 266 | else |
0d71dbfd | 267 | eval_gettextln "Reactivating local git directory for submodule '\$sm_name'." |
4b7c286e JL |
268 | fi |
269 | fi | |
a0ef2934 | 270 | git submodule--helper clone ${GIT_QUIET:+--quiet} ${progress:+"--progress"} --prefix "$wt_prefix" --path "$sm_path" --name "$sm_name" --url "$realrepo" ${reference:+"$reference"} ${dissociate:+"--dissociate"} ${depth:+"$depth"} || exit |
d851ffb9 | 271 | ( |
14111fc4 | 272 | sanitize_submodule_env |
d851ffb9 JH |
273 | cd "$sm_path" && |
274 | # ash fails to wordsplit ${branch:+-b "$branch"...} | |
275 | case "$branch" in | |
276 | '') git checkout -f -q ;; | |
277 | ?*) git checkout -f -q -B "$branch" "origin/$branch" ;; | |
278 | esac | |
279 | ) || die "$(eval_gettext "Unable to checkout submodule '\$sm_path'")" | |
d4264ca3 | 280 | fi |
73b0898d | 281 | git config submodule."$sm_name".url "$realrepo" |
d4264ca3 | 282 | |
53213994 | 283 | git add --no-warn-embedded-repo $force "$sm_path" || |
64394e3a | 284 | die "$(eval_gettext "Failed to add submodule '\$sm_path'")" |
ecda0723 | 285 | |
b2faad44 AO |
286 | git submodule--helper config submodule."$sm_name".path "$sm_path" && |
287 | git submodule--helper config submodule."$sm_name".url "$repo" && | |
b9289227 TK |
288 | if test -n "$branch" |
289 | then | |
b2faad44 | 290 | git submodule--helper config submodule."$sm_name".branch "$branch" |
b9289227 | 291 | fi && |
31991b02 | 292 | git add --force .gitmodules || |
64394e3a | 293 | die "$(eval_gettext "Failed to register submodule '\$sm_path'")" |
1b614c07 BW |
294 | |
295 | # NEEDSWORK: In a multi-working-tree world, this needs to be | |
296 | # set in the per-worktree config. | |
297 | if git config --get submodule.active >/dev/null | |
298 | then | |
299 | # If the submodule being adding isn't already covered by the | |
300 | # current configured pathspec, set the submodule's active flag | |
301 | if ! git submodule--helper is-active "$sm_path" | |
302 | then | |
303 | git config submodule."$sm_name".active "true" | |
304 | fi | |
305 | else | |
306 | git config submodule."$sm_name".active "true" | |
307 | fi | |
ecda0723 SV |
308 | } |
309 | ||
19a31f9c ML |
310 | # |
311 | # Execute an arbitrary command sequence in each checked out | |
312 | # submodule | |
313 | # | |
314 | # $@ = command to execute | |
315 | # | |
316 | cmd_foreach() | |
317 | { | |
1d5bec8b JH |
318 | # parse $args after "submodule ... foreach". |
319 | while test $# -ne 0 | |
320 | do | |
321 | case "$1" in | |
322 | -q|--quiet) | |
323 | GIT_QUIET=1 | |
324 | ;; | |
15fc56a8 JH |
325 | --recursive) |
326 | recursive=1 | |
327 | ;; | |
1d5bec8b JH |
328 | -*) |
329 | usage | |
330 | ;; | |
331 | *) | |
332 | break | |
333 | ;; | |
334 | esac | |
335 | shift | |
336 | done | |
337 | ||
1cf823d8 | 338 | git ${wt_prefix:+-C "$wt_prefix"} submodule--helper foreach ${GIT_QUIET:+--quiet} ${recursive:+--recursive} -- "$@" |
19a31f9c ML |
339 | } |
340 | ||
70c7ac22 | 341 | # |
211b7f19 | 342 | # Register submodules in .git/config |
70c7ac22 LH |
343 | # |
344 | # $@ = requested paths (default to all) | |
345 | # | |
23a485e3 | 346 | cmd_init() |
70c7ac22 | 347 | { |
5c08dbbd JH |
348 | # parse $args after "submodule ... init". |
349 | while test $# -ne 0 | |
350 | do | |
351 | case "$1" in | |
352 | -q|--quiet) | |
2e6a30ef | 353 | GIT_QUIET=1 |
5c08dbbd JH |
354 | ;; |
355 | --) | |
356 | shift | |
357 | break | |
358 | ;; | |
359 | -*) | |
360 | usage | |
361 | ;; | |
362 | *) | |
363 | break | |
364 | ;; | |
365 | esac | |
366 | shift | |
367 | done | |
368 | ||
a282f5a9 | 369 | git ${wt_prefix:+-C "$wt_prefix"} ${prefix:+--super-prefix "$prefix"} submodule--helper init ${GIT_QUIET:+--quiet} -- "$@" |
70c7ac22 LH |
370 | } |
371 | ||
cf419828 JL |
372 | # |
373 | # Unregister submodules from .git/config and remove their work tree | |
374 | # | |
cf419828 JL |
375 | cmd_deinit() |
376 | { | |
377 | # parse $args after "submodule ... deinit". | |
f6a52799 | 378 | deinit_all= |
cf419828 JL |
379 | while test $# -ne 0 |
380 | do | |
381 | case "$1" in | |
382 | -f|--force) | |
383 | force=$1 | |
384 | ;; | |
385 | -q|--quiet) | |
386 | GIT_QUIET=1 | |
387 | ;; | |
f6a52799 SB |
388 | --all) |
389 | deinit_all=t | |
390 | ;; | |
cf419828 JL |
391 | --) |
392 | shift | |
393 | break | |
394 | ;; | |
395 | -*) | |
396 | usage | |
397 | ;; | |
398 | *) | |
399 | break | |
400 | ;; | |
401 | esac | |
402 | shift | |
403 | done | |
404 | ||
1cf823d8 | 405 | git ${wt_prefix:+-C "$wt_prefix"} submodule--helper deinit ${GIT_QUIET:+--quiet} ${force:+--force} ${deinit_all:+--all} -- "$@" |
cf419828 JL |
406 | } |
407 | ||
fb43e31f | 408 | is_tip_reachable () ( |
01e1d544 | 409 | sanitize_submodule_env && |
fb43e31f SB |
410 | cd "$1" && |
411 | rev=$(git rev-list -n 1 "$2" --not --all 2>/dev/null) && | |
412 | test -z "$rev" | |
413 | ) | |
414 | ||
66d36b94 JK |
415 | # usage: fetch_in_submodule <module_path> [<depth>] [<sha1>] |
416 | # Because arguments are positional, use an empty string to omit <depth> | |
417 | # but include <sha1>. | |
fb43e31f | 418 | fetch_in_submodule () ( |
01e1d544 | 419 | sanitize_submodule_env && |
fb43e31f | 420 | cd "$1" && |
1c151807 ÆAB |
421 | if test $# -eq 3 |
422 | then | |
62af4bdd | 423 | echo "$3" | git fetch ${GIT_QUIET:+--quiet} --stdin ${2:+"$2"} |
1c151807 | 424 | else |
62af4bdd | 425 | git fetch ${GIT_QUIET:+--quiet} ${2:+"$2"} |
1c151807 | 426 | fi |
fb43e31f SB |
427 | ) |
428 | ||
70c7ac22 | 429 | # |
211b7f19 | 430 | # Update each submodule path to correct revision, using clone and checkout as needed |
70c7ac22 LH |
431 | # |
432 | # $@ = requested paths (default to all) | |
433 | # | |
23a485e3 | 434 | cmd_update() |
70c7ac22 | 435 | { |
5c08dbbd JH |
436 | # parse $args after "submodule ... update". |
437 | while test $# -ne 0 | |
438 | do | |
439 | case "$1" in | |
440 | -q|--quiet) | |
2e6a30ef | 441 | GIT_QUIET=1 |
5c08dbbd | 442 | ;; |
e84c3cf3 | 443 | -v) |
3ad0401e | 444 | unset GIT_QUIET |
e84c3cf3 | 445 | ;; |
72c5f883 | 446 | --progress) |
c7199e3a | 447 | progress=1 |
72c5f883 | 448 | ;; |
be4d2c83 | 449 | -i|--init) |
d92a3959 | 450 | init=1 |
be4d2c83 | 451 | ;; |
0060fd15 JS |
452 | --require-init) |
453 | init=1 | |
454 | require_init=1 | |
455 | ;; | |
06b1abb5 TK |
456 | --remote) |
457 | remote=1 | |
458 | ;; | |
31ca3ac3 | 459 | -N|--no-fetch) |
31ca3ac3 FF |
460 | nofetch=1 |
461 | ;; | |
9db31bdf NMC |
462 | -f|--force) |
463 | force=$1 | |
464 | ;; | |
ca2cedba | 465 | -r|--rebase) |
32948425 | 466 | update="rebase" |
ca2cedba | 467 | ;; |
d92a3959 MT |
468 | --reference) |
469 | case "$2" in '') usage ;; esac | |
470 | reference="--reference=$2" | |
98dbe63d | 471 | shift |
d92a3959 MT |
472 | ;; |
473 | --reference=*) | |
474 | reference="$1" | |
d92a3959 | 475 | ;; |
a0ef2934 CF |
476 | --dissociate) |
477 | dissociate=1 | |
478 | ;; | |
42b49178 | 479 | -m|--merge) |
42b49178 JH |
480 | update="merge" |
481 | ;; | |
b13fd5c1 | 482 | --recursive) |
b13fd5c1 JH |
483 | recursive=1 |
484 | ;; | |
efc5fb6a JH |
485 | --checkout) |
486 | update="checkout" | |
487 | ;; | |
abed000a SB |
488 | --recommend-shallow) |
489 | recommend_shallow="--recommend-shallow" | |
490 | ;; | |
491 | --no-recommend-shallow) | |
492 | recommend_shallow="--no-recommend-shallow" | |
493 | ;; | |
275cd184 FG |
494 | --depth) |
495 | case "$2" in '') usage ;; esac | |
496 | depth="--depth=$2" | |
497 | shift | |
498 | ;; | |
499 | --depth=*) | |
500 | depth=$1 | |
501 | ;; | |
2335b870 SB |
502 | -j|--jobs) |
503 | case "$2" in '') usage ;; esac | |
504 | jobs="--jobs=$2" | |
505 | shift | |
506 | ;; | |
507 | --jobs=*) | |
508 | jobs=$1 | |
509 | ;; | |
132f600b ES |
510 | --single-branch) |
511 | single_branch="--single-branch" | |
512 | ;; | |
513 | --no-single-branch) | |
514 | single_branch="--no-single-branch" | |
515 | ;; | |
5c08dbbd JH |
516 | --) |
517 | shift | |
518 | break | |
519 | ;; | |
520 | -*) | |
521 | usage | |
522 | ;; | |
523 | *) | |
524 | break | |
525 | ;; | |
526 | esac | |
98dbe63d | 527 | shift |
5c08dbbd JH |
528 | done |
529 | ||
d92a3959 MT |
530 | if test -n "$init" |
531 | then | |
532 | cmd_init "--" "$@" || return | |
533 | fi | |
534 | ||
48308681 SB |
535 | { |
536 | git submodule--helper update-clone ${GIT_QUIET:+--quiet} \ | |
c7199e3a | 537 | ${progress:+"--progress"} \ |
48308681 SB |
538 | ${wt_prefix:+--prefix "$wt_prefix"} \ |
539 | ${prefix:+--recursive-prefix "$prefix"} \ | |
540 | ${update:+--update "$update"} \ | |
5f50f33e | 541 | ${reference:+"$reference"} \ |
a0ef2934 | 542 | ${dissociate:+"--dissociate"} \ |
48308681 | 543 | ${depth:+--depth "$depth"} \ |
0060fd15 | 544 | ${require_init:+--require-init} \ |
132f600b | 545 | $single_branch \ |
c7199e3a CF |
546 | $recommend_shallow \ |
547 | $jobs \ | |
a282f5a9 | 548 | -- \ |
c4c02bf1 | 549 | "$@" || echo "#unmatched" $? |
48308681 | 550 | } | { |
15ffb7cd | 551 | err= |
9eca701f | 552 | while read -r quickabort sha1 just_cloned sm_path |
70c7ac22 | 553 | do |
9eca701f | 554 | die_if_unmatched "$quickabort" "$sha1" |
48308681 | 555 | |
5d124f41 | 556 | git submodule--helper ensure-core-worktree "$sm_path" || exit 1 |
74d4731d | 557 | |
ee69b2a9 | 558 | update_module=$(git submodule--helper update-module-mode $just_cloned "$sm_path" $update) |
efc5fb6a | 559 | |
44431df0 | 560 | displaypath=$(git submodule--helper relative-path "$prefix$sm_path" "$wt_prefix") |
091a6eb0 | 561 | |
48308681 | 562 | if test $just_cloned -eq 1 |
d851ffb9 | 563 | then |
bf2d8246 LH |
564 | subsha1= |
565 | else | |
14111fc4 | 566 | subsha1=$(sanitize_submodule_env; cd "$sm_path" && |
5be60078 | 567 | git rev-parse --verify HEAD) || |
091a6eb0 | 568 | die "$(eval_gettext "Unable to find current revision in submodule path '\$displaypath'")" |
70c7ac22 | 569 | fi |
211b7f19 | 570 | |
06b1abb5 TK |
571 | if test -n "$remote" |
572 | then | |
92bbe7cc | 573 | branch=$(git submodule--helper remote-branch "$sm_path") |
06b1abb5 TK |
574 | if test -z "$nofetch" |
575 | then | |
576 | # Fetch remote before determining tracking $sha1 | |
6cbf454a | 577 | fetch_in_submodule "$sm_path" $depth || |
06b1abb5 TK |
578 | die "$(eval_gettext "Unable to fetch in submodule path '\$sm_path'")" |
579 | fi | |
e63f7b0a | 580 | remote_name=$(sanitize_submodule_env; cd "$sm_path" && git submodule--helper print-default-remote) |
14111fc4 | 581 | sha1=$(sanitize_submodule_env; cd "$sm_path" && |
06b1abb5 | 582 | git rev-parse --verify "${remote_name}/${branch}") || |
c87302bf | 583 | die "$(eval_gettext "Unable to find current \${remote_name}/\${branch} revision in submodule path '\$sm_path'")" |
06b1abb5 TK |
584 | fi |
585 | ||
496eeeb1 | 586 | if test "$subsha1" != "$sha1" || test -n "$force" |
70c7ac22 | 587 | then |
9db31bdf NMC |
588 | subforce=$force |
589 | # If we don't already have a -f flag and the submodule has never been checked out | |
496eeeb1 | 590 | if test -z "$subsha1" && test -z "$force" |
b9b378a0 | 591 | then |
9db31bdf | 592 | subforce="-f" |
b9b378a0 | 593 | fi |
31ca3ac3 FF |
594 | |
595 | if test -z "$nofetch" | |
596 | then | |
e5f522d6 JL |
597 | # Run fetch only if $sha1 isn't present or it |
598 | # is not reachable from a ref. | |
fb43e31f | 599 | is_tip_reachable "$sm_path" "$sha1" || |
6cbf454a | 600 | fetch_in_submodule "$sm_path" $depth || |
bd5e567d | 601 | say "$(eval_gettext "Unable to fetch in submodule path '\$displaypath'; trying to directly fetch \$sha1:")" |
fb43e31f SB |
602 | |
603 | # Now we tried the usual fetch, but $sha1 may | |
604 | # not be reachable from any of the refs | |
605 | is_tip_reachable "$sm_path" "$sha1" || | |
66d36b94 | 606 | fetch_in_submodule "$sm_path" "$depth" "$sha1" || |
c87302bf | 607 | die "$(eval_gettext "Fetched in submodule path '\$displaypath', but it did not contain \$sha1. Direct fetching of that commit failed.")" |
31ca3ac3 FF |
608 | fi |
609 | ||
877449c1 | 610 | must_die_on_failure= |
32948425 | 611 | case "$update_module" in |
a2aed08b TK |
612 | checkout) |
613 | command="git checkout $subforce -q" | |
614 | die_msg="$(eval_gettext "Unable to checkout '\$sha1' in submodule path '\$displaypath'")" | |
615 | say_msg="$(eval_gettext "Submodule path '\$displaypath': checked out '\$sha1'")" | |
616 | ;; | |
32948425 | 617 | rebase) |
3ad0401e | 618 | command="git rebase ${GIT_QUIET:+--quiet}" |
091a6eb0 JK |
619 | die_msg="$(eval_gettext "Unable to rebase '\$sha1' in submodule path '\$displaypath'")" |
620 | say_msg="$(eval_gettext "Submodule path '\$displaypath': rebased into '\$sha1'")" | |
877449c1 | 621 | must_die_on_failure=yes |
32948425 | 622 | ;; |
42b49178 | 623 | merge) |
3ad0401e | 624 | command="git merge ${GIT_QUIET:+--quiet}" |
091a6eb0 JK |
625 | die_msg="$(eval_gettext "Unable to merge '\$sha1' in submodule path '\$displaypath'")" |
626 | say_msg="$(eval_gettext "Submodule path '\$displaypath': merged in '\$sha1'")" | |
877449c1 | 627 | must_die_on_failure=yes |
42b49178 | 628 | ;; |
6cb5728c CP |
629 | !*) |
630 | command="${update_module#!}" | |
b08238ac SB |
631 | die_msg="$(eval_gettext "Execution of '\$command \$sha1' failed in submodule path '\$displaypath'")" |
632 | say_msg="$(eval_gettext "Submodule path '\$displaypath': '\$command \$sha1'")" | |
6cb5728c CP |
633 | must_die_on_failure=yes |
634 | ;; | |
32948425 | 635 | *) |
ff03d930 | 636 | die "$(eval_gettext "Invalid update mode '$update_module' for submodule path '$path'")" |
32948425 | 637 | esac |
70c7ac22 | 638 | |
14111fc4 | 639 | if (sanitize_submodule_env; cd "$sm_path" && $command "$sha1") |
15ffb7cd | 640 | then |
ff968f03 | 641 | say "$say_msg" |
877449c1 JH |
642 | elif test -n "$must_die_on_failure" |
643 | then | |
ff968f03 | 644 | die_with_status 2 "$die_msg" |
15ffb7cd | 645 | else |
ff968f03 | 646 | err="${err};$die_msg" |
877449c1 | 647 | continue |
15ffb7cd | 648 | fi |
70c7ac22 | 649 | fi |
b13fd5c1 JH |
650 | |
651 | if test -n "$recursive" | |
652 | then | |
75bf5e60 | 653 | ( |
44431df0 | 654 | prefix=$(git submodule--helper relative-path "$prefix$sm_path/" "$wt_prefix") |
3604242f | 655 | wt_prefix= |
14111fc4 | 656 | sanitize_submodule_env |
75bf5e60 | 657 | cd "$sm_path" && |
36141282 | 658 | eval cmd_update |
75bf5e60 | 659 | ) |
15ffb7cd FG |
660 | res=$? |
661 | if test $res -gt 0 | |
662 | then | |
091a6eb0 | 663 | die_msg="$(eval_gettext "Failed to recurse into submodule path '\$displaypath'")" |
bb9d91b4 | 664 | if test $res -ne 2 |
15ffb7cd | 665 | then |
ff968f03 | 666 | err="${err};$die_msg" |
15ffb7cd FG |
667 | continue |
668 | else | |
ff968f03 | 669 | die_with_status $res "$die_msg" |
15ffb7cd FG |
670 | fi |
671 | fi | |
b13fd5c1 | 672 | fi |
70c7ac22 | 673 | done |
15ffb7cd FG |
674 | |
675 | if test -n "$err" | |
676 | then | |
677 | OIFS=$IFS | |
678 | IFS=';' | |
679 | for e in $err | |
680 | do | |
681 | if test -n "$e" | |
682 | then | |
683 | echo >&2 "$e" | |
684 | fi | |
685 | done | |
686 | IFS=$OIFS | |
687 | exit 1 | |
688 | fi | |
689 | } | |
70c7ac22 LH |
690 | } |
691 | ||
b57e8119 DL |
692 | # |
693 | # Configures a submodule's default branch | |
694 | # | |
695 | # $@ = requested path | |
696 | # | |
697 | cmd_set_branch() { | |
2964d6e5 | 698 | default= |
b57e8119 DL |
699 | branch= |
700 | ||
701 | while test $# -ne 0 | |
702 | do | |
703 | case "$1" in | |
704 | -q|--quiet) | |
705 | # we don't do anything with this but we need to accept it | |
706 | ;; | |
707 | -d|--default) | |
2964d6e5 | 708 | default=1 |
b57e8119 DL |
709 | ;; |
710 | -b|--branch) | |
711 | case "$2" in '') usage ;; esac | |
712 | branch=$2 | |
713 | shift | |
714 | ;; | |
715 | --) | |
716 | shift | |
717 | break | |
718 | ;; | |
719 | -*) | |
720 | usage | |
721 | ;; | |
722 | *) | |
723 | break | |
724 | ;; | |
725 | esac | |
726 | shift | |
727 | done | |
728 | ||
1cf823d8 | 729 | git ${wt_prefix:+-C "$wt_prefix"} submodule--helper set-branch ${GIT_QUIET:+--quiet} ${branch:+--branch "$branch"} ${default:+--default} -- "$@" |
b57e8119 DL |
730 | } |
731 | ||
26b06100 DL |
732 | # |
733 | # Configures a submodule's remote url | |
734 | # | |
735 | # $@ = requested path, requested url | |
736 | # | |
737 | cmd_set_url() { | |
738 | while test $# -ne 0 | |
739 | do | |
740 | case "$1" in | |
741 | -q|--quiet) | |
742 | GIT_QUIET=1 | |
743 | ;; | |
744 | --) | |
745 | shift | |
746 | break | |
747 | ;; | |
748 | -*) | |
749 | usage | |
750 | ;; | |
751 | *) | |
752 | break | |
753 | ;; | |
754 | esac | |
755 | shift | |
756 | done | |
757 | ||
1cf823d8 | 758 | git ${wt_prefix:+-C "$wt_prefix"} submodule--helper set-url ${GIT_QUIET:+--quiet} -- "$@" |
26b06100 DL |
759 | } |
760 | ||
28f9af5d PY |
761 | # |
762 | # Show commit summary for submodules in index or working tree | |
763 | # | |
764 | # If '--cached' is given, show summary between index and given commit, | |
765 | # or between working tree and given commit | |
766 | # | |
767 | # $@ = [commit (default 'HEAD'),] requested paths (default all) | |
768 | # | |
769 | cmd_summary() { | |
f2dc06a3 | 770 | summary_limit=-1 |
d0f64dd4 | 771 | for_status= |
1c244f6e | 772 | diff_cmd=diff-index |
f2dc06a3 | 773 | |
28f9af5d PY |
774 | # parse $args after "submodule ... summary". |
775 | while test $# -ne 0 | |
776 | do | |
777 | case "$1" in | |
778 | --cached) | |
779 | cached="$1" | |
780 | ;; | |
1c244f6e JL |
781 | --files) |
782 | files="$1" | |
783 | ;; | |
d0f64dd4 PY |
784 | --for-status) |
785 | for_status="$1" | |
786 | ;; | |
f2dc06a3 | 787 | -n|--summary-limit) |
862ae6cd RS |
788 | summary_limit="$2" |
789 | isnumber "$summary_limit" || usage | |
f2dc06a3 PY |
790 | shift |
791 | ;; | |
862ae6cd RS |
792 | --summary-limit=*) |
793 | summary_limit="${1#--summary-limit=}" | |
794 | isnumber "$summary_limit" || usage | |
795 | ;; | |
28f9af5d PY |
796 | --) |
797 | shift | |
798 | break | |
799 | ;; | |
800 | -*) | |
801 | usage | |
802 | ;; | |
803 | *) | |
804 | break | |
805 | ;; | |
806 | esac | |
807 | shift | |
808 | done | |
bffe71f4 | 809 | |
1cf823d8 | 810 | git ${wt_prefix:+-C "$wt_prefix"} submodule--helper summary ${files:+--files} ${cached:+--cached} ${for_status:+--for-status} ${summary_limit:+-n $summary_limit} -- "$@" |
28f9af5d | 811 | } |
70c7ac22 | 812 | # |
941987a5 | 813 | # List all submodules, prefixed with: |
70c7ac22 LH |
814 | # - submodule not initialized |
815 | # + different revision checked out | |
816 | # | |
817 | # If --cached was specified the revision in the index will be printed | |
818 | # instead of the currently checked out revision. | |
819 | # | |
820 | # $@ = requested paths (default to all) | |
821 | # | |
23a485e3 | 822 | cmd_status() |
70c7ac22 | 823 | { |
5c08dbbd JH |
824 | # parse $args after "submodule ... status". |
825 | while test $# -ne 0 | |
826 | do | |
827 | case "$1" in | |
828 | -q|--quiet) | |
2e6a30ef | 829 | GIT_QUIET=1 |
5c08dbbd JH |
830 | ;; |
831 | --cached) | |
832 | cached=1 | |
833 | ;; | |
64b19ffe JH |
834 | --recursive) |
835 | recursive=1 | |
836 | ;; | |
5c08dbbd JH |
837 | --) |
838 | shift | |
839 | break | |
840 | ;; | |
841 | -*) | |
842 | usage | |
843 | ;; | |
844 | *) | |
845 | break | |
846 | ;; | |
847 | esac | |
848 | shift | |
849 | done | |
850 | ||
1cf823d8 | 851 | git ${wt_prefix:+-C "$wt_prefix"} submodule--helper status ${GIT_QUIET:+--quiet} ${cached:+--cached} ${recursive:+--recursive} -- "$@" |
70c7ac22 | 852 | } |
2327f61e DA |
853 | # |
854 | # Sync remote urls for submodules | |
855 | # This makes the value for remote.$remote.url match the value | |
856 | # specified in .gitmodules. | |
857 | # | |
858 | cmd_sync() | |
859 | { | |
860 | while test $# -ne 0 | |
861 | do | |
862 | case "$1" in | |
863 | -q|--quiet) | |
2e6a30ef | 864 | GIT_QUIET=1 |
2327f61e DA |
865 | shift |
866 | ;; | |
82f49f29 PH |
867 | --recursive) |
868 | recursive=1 | |
869 | shift | |
870 | ;; | |
2327f61e DA |
871 | --) |
872 | shift | |
873 | break | |
874 | ;; | |
875 | -*) | |
876 | usage | |
877 | ;; | |
878 | *) | |
879 | break | |
880 | ;; | |
881 | esac | |
882 | done | |
e7849a96 | 883 | |
1cf823d8 | 884 | git ${wt_prefix:+-C "$wt_prefix"} submodule--helper sync ${GIT_QUIET:+--quiet} ${recursive:+--recursive} -- "$@" |
2327f61e | 885 | } |
70c7ac22 | 886 | |
f6f85861 SB |
887 | cmd_absorbgitdirs() |
888 | { | |
889 | git submodule--helper absorb-git-dirs --prefix "$wt_prefix" "$@" | |
890 | } | |
891 | ||
5c08dbbd JH |
892 | # This loop parses the command line arguments to find the |
893 | # subcommand name to dispatch. Parsing of the subcommand specific | |
894 | # options are primarily done by the subcommand implementations. | |
895 | # Subcommand specific options such as --branch and --cached are | |
896 | # parsed here as well, for backward compatibility. | |
897 | ||
898 | while test $# != 0 && test -z "$command" | |
70c7ac22 LH |
899 | do |
900 | case "$1" in | |
26b06100 | 901 | add | foreach | init | deinit | update | set-branch | set-url | status | summary | sync | absorbgitdirs) |
5c08dbbd | 902 | command=$1 |
70c7ac22 LH |
903 | ;; |
904 | -q|--quiet) | |
2e6a30ef | 905 | GIT_QUIET=1 |
70c7ac22 | 906 | ;; |
ecda0723 SV |
907 | -b|--branch) |
908 | case "$2" in | |
909 | '') | |
910 | usage | |
911 | ;; | |
912 | esac | |
913 | branch="$2"; shift | |
914 | ;; | |
70c7ac22 | 915 | --cached) |
28f9af5d | 916 | cached="$1" |
70c7ac22 LH |
917 | ;; |
918 | --) | |
919 | break | |
920 | ;; | |
921 | -*) | |
922 | usage | |
923 | ;; | |
924 | *) | |
925 | break | |
926 | ;; | |
927 | esac | |
928 | shift | |
929 | done | |
930 | ||
5c08dbbd | 931 | # No command word defaults to "status" |
af9c9f97 RR |
932 | if test -z "$command" |
933 | then | |
934 | if test $# = 0 | |
935 | then | |
936 | command=status | |
937 | else | |
938 | usage | |
939 | fi | |
940 | fi | |
5c08dbbd | 941 | |
b57e8119 DL |
942 | # "-b branch" is accepted only by "add" and "set-branch" |
943 | if test -n "$branch" && (test "$command" != add || test "$command" != set-branch) | |
5c08dbbd | 944 | then |
ecda0723 | 945 | usage |
5c08dbbd JH |
946 | fi |
947 | ||
28f9af5d | 948 | # "--cached" is accepted only by "status" and "summary" |
496eeeb1 | 949 | if test -n "$cached" && test "$command" != status && test "$command" != summary |
5c08dbbd | 950 | then |
70c7ac22 | 951 | usage |
5c08dbbd JH |
952 | fi |
953 | ||
b57e8119 | 954 | "cmd_$(echo $command | sed -e s/-/_/g)" "$@" |