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