]>
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>...] |
cf419828 | 11 | or: $dashless [--quiet] deinit [-f|--force] [--] <path>... |
893a9764 | 12 | or: $dashless [--quiet] update [--init] [--remote] [-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--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> |
82f49f29 | 15 | or: $dashless [--quiet] sync [--recursive] [--] [<path>...]" |
8f321a39 | 16 | OPTIONS_SPEC= |
091a6eb0 | 17 | SUBDIRECTORY_OK=Yes |
70c7ac22 | 18 | . git-sh-setup |
d0ad8251 | 19 | . git-sh-i18n |
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 | |
33cfccbb JK |
25 | # Restrict ourselves to a vanilla subset of protocols; the URLs |
26 | # we get are under control of a remote repository, and we do not | |
27 | # want them kicking off arbitrary git-remote-* programs. | |
28 | # | |
29 | # If the user has already specified a set of allowed protocols, | |
30 | # we assume they know what they're doing and use that instead. | |
31 | : ${GIT_ALLOW_PROTOCOL=file:git:http:https:ssh} | |
32 | export GIT_ALLOW_PROTOCOL | |
33 | ||
5c08dbbd | 34 | command= |
ecda0723 | 35 | branch= |
d27b876b | 36 | force= |
d92a3959 | 37 | reference= |
70c7ac22 | 38 | cached= |
48bb3033 GP |
39 | recursive= |
40 | init= | |
1c244f6e | 41 | files= |
06b1abb5 | 42 | remote= |
31ca3ac3 | 43 | nofetch= |
32948425 | 44 | update= |
15fc56a8 | 45 | prefix= |
73b0898d | 46 | custom_name= |
275cd184 | 47 | depth= |
70c7ac22 | 48 | |
967b2c66 JS |
49 | # The function takes at most 2 arguments. The first argument is the |
50 | # URL that navigates to the submodule origin repo. When relative, this URL | |
51 | # is relative to the superproject origin URL repo. The second up_path | |
52 | # argument, if specified, is the relative path that navigates | |
53 | # from the submodule working tree to the superproject working tree. | |
54 | # | |
55 | # The output of the function is the origin URL of the submodule. | |
56 | # | |
57 | # The output will either be an absolute URL or filesystem path (if the | |
58 | # superproject origin URL is an absolute URL or filesystem path, | |
59 | # respectively) or a relative file system path (if the superproject | |
60 | # origin URL is a relative file system path). | |
61 | # | |
62 | # When the output is a relative file system path, the path is either | |
63 | # relative to the submodule working tree, if up_path is specified, or to | |
64 | # the superproject working tree otherwise. | |
f31a522a ML |
65 | resolve_relative_url () |
66 | { | |
98fcf840 | 67 | remote=$(get_default_remote) |
8e7e6f39 | 68 | remoteurl=$(git config "remote.$remote.url") || |
4d689320 | 69 | remoteurl=$(pwd) # the repository is its own authoritative upstream |
f31a522a | 70 | url="$1" |
99b120af | 71 | remoteurl=${remoteurl%/} |
ea640cc6 | 72 | sep=/ |
967b2c66 JS |
73 | up_path="$2" |
74 | ||
75 | case "$remoteurl" in | |
76 | *:*|/*) | |
77 | is_relative= | |
78 | ;; | |
758615e2 JS |
79 | ./*|../*) |
80 | is_relative=t | |
81 | ;; | |
967b2c66 JS |
82 | *) |
83 | is_relative=t | |
758615e2 | 84 | remoteurl="./$remoteurl" |
967b2c66 JS |
85 | ;; |
86 | esac | |
87 | ||
f31a522a ML |
88 | while test -n "$url" |
89 | do | |
90 | case "$url" in | |
91 | ../*) | |
92 | url="${url#../}" | |
ea640cc6 TR |
93 | case "$remoteurl" in |
94 | */*) | |
95 | remoteurl="${remoteurl%/*}" | |
96 | ;; | |
97 | *:*) | |
98 | remoteurl="${remoteurl%:*}" | |
99 | sep=: | |
100 | ;; | |
101 | *) | |
758615e2 JS |
102 | if test -z "$is_relative" || test "." = "$remoteurl" |
103 | then | |
104 | die "$(eval_gettext "cannot strip one component off url '\$remoteurl'")" | |
105 | else | |
106 | remoteurl=. | |
107 | fi | |
ea640cc6 TR |
108 | ;; |
109 | esac | |
f31a522a ML |
110 | ;; |
111 | ./*) | |
112 | url="${url#./}" | |
113 | ;; | |
114 | *) | |
115 | break;; | |
116 | esac | |
117 | done | |
758615e2 JS |
118 | remoteurl="$remoteurl$sep${url%/}" |
119 | echo "${is_relative:+${up_path}}${remoteurl#./}" | |
f31a522a ML |
120 | } |
121 | ||
091a6eb0 JK |
122 | # Resolve a path to be relative to another path. This is intended for |
123 | # converting submodule paths when git-submodule is run in a subdirectory | |
124 | # and only handles paths where the directory separator is '/'. | |
125 | # | |
126 | # The output is the first argument as a path relative to the second argument, | |
127 | # which defaults to $wt_prefix if it is omitted. | |
128 | relative_path () | |
129 | { | |
130 | local target curdir result | |
131 | target=$1 | |
132 | curdir=${2-$wt_prefix} | |
133 | curdir=${curdir%/} | |
134 | result= | |
135 | ||
136 | while test -n "$curdir" | |
137 | do | |
138 | case "$target" in | |
139 | "$curdir/"*) | |
140 | target=${target#"$curdir"/} | |
141 | break | |
142 | ;; | |
143 | esac | |
144 | ||
145 | result="${result}../" | |
146 | if test "$curdir" = "${curdir%/*}" | |
147 | then | |
148 | curdir= | |
149 | else | |
150 | curdir="${curdir%/*}" | |
151 | fi | |
152 | done | |
153 | ||
154 | echo "$result$target" | |
155 | } | |
156 | ||
be9d0a3a HV |
157 | die_if_unmatched () |
158 | { | |
159 | if test "$1" = "#unmatched" | |
160 | then | |
161 | exit 1 | |
162 | fi | |
163 | } | |
164 | ||
88ce00c3 TK |
165 | # |
166 | # Print a submodule configuration setting | |
167 | # | |
168 | # $1 = submodule name | |
169 | # $2 = option name | |
170 | # $3 = default value | |
171 | # | |
172 | # Checks in the usual git-config places first (for overrides), | |
173 | # otherwise it falls back on .gitmodules. This allows you to | |
174 | # distribute project-wide defaults in .gitmodules, while still | |
175 | # customizing individual repositories if necessary. If the option is | |
176 | # not in .gitmodules either, print a default value. | |
177 | # | |
178 | get_submodule_config () { | |
179 | name="$1" | |
180 | option="$2" | |
181 | default="$3" | |
182 | value=$(git config submodule."$name"."$option") | |
183 | if test -z "$value" | |
184 | then | |
185 | value=$(git config -f .gitmodules submodule."$name"."$option") | |
186 | fi | |
187 | printf '%s' "${value:-$default}" | |
188 | } | |
189 | ||
862ae6cd RS |
190 | isnumber() |
191 | { | |
192 | n=$(($1 + 0)) 2>/dev/null && test "$n" = "$1" | |
193 | } | |
194 | ||
14111fc4 JK |
195 | # Sanitize the local git environment for use within a submodule. We |
196 | # can't simply use clear_local_git_env since we want to preserve some | |
197 | # of the settings from GIT_CONFIG_PARAMETERS. | |
198 | sanitize_submodule_env() | |
199 | { | |
200 | sanitized_config=$(git submodule--helper sanitize-config) | |
201 | clear_local_git_env | |
202 | GIT_CONFIG_PARAMETERS=$sanitized_config | |
203 | } | |
204 | ||
ecda0723 SV |
205 | # |
206 | # Add a new submodule to the working tree, .gitmodules and the index | |
207 | # | |
ec05df35 | 208 | # $@ = repo path |
ecda0723 SV |
209 | # |
210 | # optional branch is stored in global branch variable | |
211 | # | |
23a485e3 | 212 | cmd_add() |
ecda0723 | 213 | { |
5c08dbbd | 214 | # parse $args after "submodule ... add". |
091a6eb0 | 215 | reference_path= |
5c08dbbd JH |
216 | while test $# -ne 0 |
217 | do | |
218 | case "$1" in | |
219 | -b | --branch) | |
220 | case "$2" in '') usage ;; esac | |
221 | branch=$2 | |
222 | shift | |
223 | ;; | |
d27b876b JL |
224 | -f | --force) |
225 | force=$1 | |
226 | ;; | |
5c08dbbd | 227 | -q|--quiet) |
2e6a30ef | 228 | GIT_QUIET=1 |
5c08dbbd | 229 | ;; |
d92a3959 MT |
230 | --reference) |
231 | case "$2" in '') usage ;; esac | |
091a6eb0 | 232 | reference_path=$2 |
d92a3959 MT |
233 | shift |
234 | ;; | |
235 | --reference=*) | |
091a6eb0 | 236 | reference_path="${1#--reference=}" |
d92a3959 | 237 | ;; |
73b0898d JL |
238 | --name) |
239 | case "$2" in '') usage ;; esac | |
240 | custom_name=$2 | |
241 | shift | |
242 | ;; | |
275cd184 FG |
243 | --depth) |
244 | case "$2" in '') usage ;; esac | |
245 | depth="--depth=$2" | |
246 | shift | |
247 | ;; | |
248 | --depth=*) | |
249 | depth=$1 | |
250 | ;; | |
5c08dbbd JH |
251 | --) |
252 | shift | |
253 | break | |
254 | ;; | |
255 | -*) | |
256 | usage | |
257 | ;; | |
258 | *) | |
259 | break | |
260 | ;; | |
261 | esac | |
262 | shift | |
263 | done | |
264 | ||
091a6eb0 JK |
265 | if test -n "$reference_path" |
266 | then | |
267 | is_absolute_path "$reference_path" || | |
268 | reference_path="$wt_prefix$reference_path" | |
269 | ||
270 | reference="--reference=$reference_path" | |
271 | fi | |
272 | ||
ecda0723 | 273 | repo=$1 |
64394e3a | 274 | sm_path=$2 |
ecda0723 | 275 | |
64394e3a | 276 | if test -z "$sm_path"; then |
6a066230 | 277 | sm_path=$(printf '%s\n' "$repo" | |
1414e578 JL |
278 | sed -e 's|/$||' -e 's|:*/*\.git$||' -e 's|.*[/:]||g') |
279 | fi | |
280 | ||
496eeeb1 | 281 | if test -z "$repo" || test -z "$sm_path"; then |
ecda0723 SV |
282 | usage |
283 | fi | |
284 | ||
091a6eb0 JK |
285 | is_absolute_path "$sm_path" || sm_path="$wt_prefix$sm_path" |
286 | ||
ec05df35 ML |
287 | # assure repo is absolute or relative to parent |
288 | case "$repo" in | |
289 | ./*|../*) | |
091a6eb0 JK |
290 | test -z "$wt_prefix" || |
291 | die "$(gettext "Relative path can only be used from the toplevel of the working tree")" | |
292 | ||
ec05df35 ML |
293 | # dereference source url relative to parent's url |
294 | realrepo=$(resolve_relative_url "$repo") || exit | |
295 | ;; | |
296 | *:*|/*) | |
297 | # absolute url | |
298 | realrepo=$repo | |
299 | ;; | |
300 | *) | |
497ee872 | 301 | die "$(eval_gettext "repo URL: '\$repo' must be absolute or begin with ./|../")" |
ec05df35 ML |
302 | ;; |
303 | esac | |
304 | ||
db75ada5 MG |
305 | # normalize path: |
306 | # multiple //; leading ./; /./; /../; trailing / | |
64394e3a | 307 | sm_path=$(printf '%s/\n' "$sm_path" | |
db75ada5 MG |
308 | sed -e ' |
309 | s|//*|/|g | |
310 | s|^\(\./\)*|| | |
8196e728 | 311 | s|/\(\./\)*|/|g |
db75ada5 MG |
312 | :start |
313 | s|\([^/]*\)/\.\./|| | |
314 | tstart | |
315 | s|/*$|| | |
316 | ') | |
64394e3a RJ |
317 | git ls-files --error-unmatch "$sm_path" > /dev/null 2>&1 && |
318 | die "$(eval_gettext "'\$sm_path' already exists in the index")" | |
ecda0723 | 319 | |
64394e3a | 320 | if test -z "$force" && ! git add --dry-run --ignore-missing "$sm_path" > /dev/null 2>&1 |
d27b876b | 321 | then |
6ff875c5 | 322 | eval_gettextln "The following path is ignored by one of your .gitignore files: |
64394e3a | 323 | \$sm_path |
6ff875c5 | 324 | Use -f if you really want to add it." >&2 |
d27b876b JL |
325 | exit 1 |
326 | fi | |
327 | ||
73b0898d JL |
328 | if test -n "$custom_name" |
329 | then | |
330 | sm_name="$custom_name" | |
331 | else | |
332 | sm_name="$sm_path" | |
333 | fi | |
334 | ||
d4264ca3 | 335 | # perhaps the path exists and is already a git repo, else clone it |
64394e3a | 336 | if test -e "$sm_path" |
d4264ca3 | 337 | then |
496eeeb1 | 338 | if test -d "$sm_path"/.git || test -f "$sm_path"/.git |
d4264ca3 | 339 | then |
64394e3a | 340 | eval_gettextln "Adding existing repo at '\$sm_path' to the index" |
d4264ca3 | 341 | else |
64394e3a | 342 | die "$(eval_gettext "'\$sm_path' already exists and is not a valid git repo")" |
d4264ca3 | 343 | fi |
c2f93917 | 344 | |
d4264ca3 | 345 | else |
4b7c286e JL |
346 | if test -d ".git/modules/$sm_name" |
347 | then | |
348 | if test -z "$force" | |
349 | then | |
350 | echo >&2 "$(eval_gettext "A git directory for '\$sm_name' is found locally with remote(s):")" | |
351 | GIT_DIR=".git/modules/$sm_name" GIT_WORK_TREE=. git remote -v | grep '(fetch)' | sed -e s,^," ", -e s,' (fetch)',, >&2 | |
352 | echo >&2 "$(eval_gettext "If you want to reuse this local git directory instead of cloning again from")" | |
353 | echo >&2 " $realrepo" | |
354 | echo >&2 "$(eval_gettext "use the '--force' option. If the local git directory is not the correct repo")" | |
355 | die "$(eval_gettext "or you are unsure what this means choose another name with the '--name' option.")" | |
356 | else | |
357 | echo "$(eval_gettext "Reactivating local git directory for submodule '\$sm_name'.")" | |
358 | fi | |
359 | fi | |
d10e3b42 | 360 | git submodule--helper clone ${GIT_QUIET:+--quiet} --prefix "$wt_prefix" --path "$sm_path" --name "$sm_name" --url "$realrepo" ${reference:+"$reference"} ${depth:+"$depth"} || exit |
d851ffb9 | 361 | ( |
14111fc4 | 362 | sanitize_submodule_env |
d851ffb9 JH |
363 | cd "$sm_path" && |
364 | # ash fails to wordsplit ${branch:+-b "$branch"...} | |
365 | case "$branch" in | |
366 | '') git checkout -f -q ;; | |
367 | ?*) git checkout -f -q -B "$branch" "origin/$branch" ;; | |
368 | esac | |
369 | ) || die "$(eval_gettext "Unable to checkout submodule '\$sm_path'")" | |
d4264ca3 | 370 | fi |
73b0898d | 371 | git config submodule."$sm_name".url "$realrepo" |
d4264ca3 | 372 | |
64394e3a RJ |
373 | git add $force "$sm_path" || |
374 | die "$(eval_gettext "Failed to add submodule '\$sm_path'")" | |
ecda0723 | 375 | |
73b0898d JL |
376 | git config -f .gitmodules submodule."$sm_name".path "$sm_path" && |
377 | git config -f .gitmodules submodule."$sm_name".url "$repo" && | |
b9289227 TK |
378 | if test -n "$branch" |
379 | then | |
380 | git config -f .gitmodules submodule."$sm_name".branch "$branch" | |
381 | fi && | |
31991b02 | 382 | git add --force .gitmodules || |
64394e3a | 383 | die "$(eval_gettext "Failed to register submodule '\$sm_path'")" |
ecda0723 SV |
384 | } |
385 | ||
19a31f9c ML |
386 | # |
387 | # Execute an arbitrary command sequence in each checked out | |
388 | # submodule | |
389 | # | |
390 | # $@ = command to execute | |
391 | # | |
392 | cmd_foreach() | |
393 | { | |
1d5bec8b JH |
394 | # parse $args after "submodule ... foreach". |
395 | while test $# -ne 0 | |
396 | do | |
397 | case "$1" in | |
398 | -q|--quiet) | |
399 | GIT_QUIET=1 | |
400 | ;; | |
15fc56a8 JH |
401 | --recursive) |
402 | recursive=1 | |
403 | ;; | |
1d5bec8b JH |
404 | -*) |
405 | usage | |
406 | ;; | |
407 | *) | |
408 | break | |
409 | ;; | |
410 | esac | |
411 | shift | |
412 | done | |
413 | ||
f030c96d ÆAB |
414 | toplevel=$(pwd) |
415 | ||
4dca1aa6 BC |
416 | # dup stdin so that it can be restored when running the external |
417 | # command in the subshell (and a recursive call to this function) | |
418 | exec 3<&0 | |
419 | ||
74703a1e | 420 | git submodule--helper list --prefix "$wt_prefix"| |
64394e3a | 421 | while read mode sha1 stage sm_path |
19a31f9c | 422 | do |
be9d0a3a | 423 | die_if_unmatched "$mode" |
64394e3a | 424 | if test -e "$sm_path"/.git |
19a31f9c | 425 | then |
ea2fa104 SB |
426 | displaypath=$(relative_path "$prefix$sm_path") |
427 | say "$(eval_gettext "Entering '\$displaypath'")" | |
0ea306ef | 428 | name=$(git submodule--helper name "$sm_path") |
15fc56a8 | 429 | ( |
64394e3a | 430 | prefix="$prefix$sm_path/" |
14111fc4 | 431 | sanitize_submodule_env |
64394e3a | 432 | cd "$sm_path" && |
091a6eb0 JK |
433 | sm_path=$(relative_path "$sm_path") && |
434 | # we make $path available to scripts ... | |
435 | path=$sm_path && | |
1c4fb136 AK |
436 | if test $# -eq 1 |
437 | then | |
438 | eval "$1" | |
439 | else | |
440 | "$@" | |
441 | fi && | |
15fc56a8 JH |
442 | if test -n "$recursive" |
443 | then | |
444 | cmd_foreach "--recursive" "$@" | |
445 | fi | |
4dca1aa6 | 446 | ) <&3 3<&- || |
ea2fa104 | 447 | die "$(eval_gettext "Stopping at '\$displaypath'; script returned non-zero status.")" |
19a31f9c ML |
448 | fi |
449 | done | |
450 | } | |
451 | ||
70c7ac22 | 452 | # |
211b7f19 | 453 | # Register submodules in .git/config |
70c7ac22 LH |
454 | # |
455 | # $@ = requested paths (default to all) | |
456 | # | |
23a485e3 | 457 | cmd_init() |
70c7ac22 | 458 | { |
5c08dbbd JH |
459 | # parse $args after "submodule ... init". |
460 | while test $# -ne 0 | |
461 | do | |
462 | case "$1" in | |
463 | -q|--quiet) | |
2e6a30ef | 464 | GIT_QUIET=1 |
5c08dbbd JH |
465 | ;; |
466 | --) | |
467 | shift | |
468 | break | |
469 | ;; | |
470 | -*) | |
471 | usage | |
472 | ;; | |
473 | *) | |
474 | break | |
475 | ;; | |
476 | esac | |
477 | shift | |
478 | done | |
479 | ||
74703a1e | 480 | git submodule--helper list --prefix "$wt_prefix" "$@" | |
64394e3a | 481 | while read mode sha1 stage sm_path |
70c7ac22 | 482 | do |
be9d0a3a | 483 | die_if_unmatched "$mode" |
0ea306ef | 484 | name=$(git submodule--helper name "$sm_path") || exit |
c1c259e2 | 485 | |
c1ab00fb | 486 | displaypath=$(relative_path "$prefix$sm_path") |
091a6eb0 | 487 | |
c1c259e2 | 488 | # Copy url setting when it is not set yet |
2cd9de3e JL |
489 | if test -z "$(git config "submodule.$name.url")" |
490 | then | |
491 | url=$(git config -f .gitmodules submodule."$name".url) | |
492 | test -z "$url" && | |
091a6eb0 | 493 | die "$(eval_gettext "No url found for submodule path '\$displaypath' in .gitmodules")" |
2cd9de3e JL |
494 | |
495 | # Possibly a url relative to parent | |
496 | case "$url" in | |
497 | ./*|../*) | |
498 | url=$(resolve_relative_url "$url") || exit | |
499 | ;; | |
500 | esac | |
501 | git config submodule."$name".url "$url" || | |
091a6eb0 | 502 | die "$(eval_gettext "Failed to register url for submodule path '\$displaypath'")" |
c1c259e2 | 503 | |
091a6eb0 | 504 | say "$(eval_gettext "Submodule '\$name' (\$url) registered for path '\$displaypath'")" |
2cd9de3e | 505 | fi |
70c7ac22 | 506 | |
2cd9de3e | 507 | # Copy "update" setting when it is not set yet |
ac1fbbda JH |
508 | if upd="$(git config -f .gitmodules submodule."$name".update)" && |
509 | test -n "$upd" && | |
510 | test -z "$(git config submodule."$name".update)" | |
511 | then | |
512 | case "$upd" in | |
efa8fd7e | 513 | checkout | rebase | merge | none) |
ac1fbbda JH |
514 | ;; # known modes of updating |
515 | *) | |
516 | echo >&2 "warning: unknown update mode '$upd' suggested for submodule '$name'" | |
517 | upd=none | |
518 | ;; | |
519 | esac | |
520 | git config submodule."$name".update "$upd" || | |
521 | die "$(eval_gettext "Failed to register update mode for submodule path '\$displaypath'")" | |
522 | fi | |
70c7ac22 LH |
523 | done |
524 | } | |
525 | ||
cf419828 JL |
526 | # |
527 | # Unregister submodules from .git/config and remove their work tree | |
528 | # | |
529 | # $@ = requested paths (use '.' to deinit all submodules) | |
530 | # | |
531 | cmd_deinit() | |
532 | { | |
533 | # parse $args after "submodule ... deinit". | |
534 | while test $# -ne 0 | |
535 | do | |
536 | case "$1" in | |
537 | -f|--force) | |
538 | force=$1 | |
539 | ;; | |
540 | -q|--quiet) | |
541 | GIT_QUIET=1 | |
542 | ;; | |
543 | --) | |
544 | shift | |
545 | break | |
546 | ;; | |
547 | -*) | |
548 | usage | |
549 | ;; | |
550 | *) | |
551 | break | |
552 | ;; | |
553 | esac | |
554 | shift | |
555 | done | |
556 | ||
557 | if test $# = 0 | |
558 | then | |
559 | die "$(eval_gettext "Use '.' if you really want to deinitialize all submodules")" | |
560 | fi | |
561 | ||
74703a1e | 562 | git submodule--helper list --prefix "$wt_prefix" "$@" | |
cf419828 JL |
563 | while read mode sha1 stage sm_path |
564 | do | |
565 | die_if_unmatched "$mode" | |
0ea306ef | 566 | name=$(git submodule--helper name "$sm_path") || exit |
cf419828 | 567 | |
091a6eb0 JK |
568 | displaypath=$(relative_path "$sm_path") |
569 | ||
cf419828 JL |
570 | # Remove the submodule work tree (unless the user already did it) |
571 | if test -d "$sm_path" | |
572 | then | |
573 | # Protect submodules containing a .git directory | |
574 | if test -d "$sm_path/.git" | |
575 | then | |
091a6eb0 | 576 | echo >&2 "$(eval_gettext "Submodule work tree '\$displaypath' contains a .git directory")" |
cf419828 JL |
577 | die "$(eval_gettext "(use 'rm -rf' if you really want to remove it including all of its history)")" |
578 | fi | |
579 | ||
580 | if test -z "$force" | |
581 | then | |
7b294bf4 | 582 | git rm -qn "$sm_path" || |
091a6eb0 | 583 | die "$(eval_gettext "Submodule work tree '\$displaypath' contains local modifications; use '-f' to discard them")" |
cf419828 | 584 | fi |
7b294bf4 | 585 | rm -rf "$sm_path" && |
091a6eb0 JK |
586 | say "$(eval_gettext "Cleared directory '\$displaypath'")" || |
587 | say "$(eval_gettext "Could not remove submodule work tree '\$displaypath'")" | |
cf419828 JL |
588 | fi |
589 | ||
091a6eb0 | 590 | mkdir "$sm_path" || say "$(eval_gettext "Could not create empty submodule directory '\$displaypath'")" |
cf419828 JL |
591 | |
592 | # Remove the .git/config entries (unless the user already did it) | |
593 | if test -n "$(git config --get-regexp submodule."$name\.")" | |
594 | then | |
595 | # Remove the whole section so we have a clean state when | |
596 | # the user later decides to init this submodule again | |
597 | url=$(git config submodule."$name".url) | |
598 | git config --remove-section submodule."$name" 2>/dev/null && | |
091a6eb0 | 599 | say "$(eval_gettext "Submodule '\$name' (\$url) unregistered for path '\$displaypath'")" |
cf419828 JL |
600 | fi |
601 | done | |
602 | } | |
603 | ||
fb43e31f | 604 | is_tip_reachable () ( |
01e1d544 | 605 | sanitize_submodule_env && |
fb43e31f SB |
606 | cd "$1" && |
607 | rev=$(git rev-list -n 1 "$2" --not --all 2>/dev/null) && | |
608 | test -z "$rev" | |
609 | ) | |
610 | ||
611 | fetch_in_submodule () ( | |
01e1d544 | 612 | sanitize_submodule_env && |
fb43e31f SB |
613 | cd "$1" && |
614 | case "$2" in | |
615 | '') | |
616 | git fetch ;; | |
617 | *) | |
618 | git fetch $(get_default_remote) "$2" ;; | |
619 | esac | |
620 | ) | |
621 | ||
70c7ac22 | 622 | # |
211b7f19 | 623 | # Update each submodule path to correct revision, using clone and checkout as needed |
70c7ac22 LH |
624 | # |
625 | # $@ = requested paths (default to all) | |
626 | # | |
23a485e3 | 627 | cmd_update() |
70c7ac22 | 628 | { |
5c08dbbd JH |
629 | # parse $args after "submodule ... update". |
630 | while test $# -ne 0 | |
631 | do | |
632 | case "$1" in | |
633 | -q|--quiet) | |
2e6a30ef | 634 | GIT_QUIET=1 |
5c08dbbd | 635 | ;; |
be4d2c83 | 636 | -i|--init) |
d92a3959 | 637 | init=1 |
be4d2c83 | 638 | ;; |
06b1abb5 TK |
639 | --remote) |
640 | remote=1 | |
641 | ;; | |
31ca3ac3 | 642 | -N|--no-fetch) |
31ca3ac3 FF |
643 | nofetch=1 |
644 | ;; | |
9db31bdf NMC |
645 | -f|--force) |
646 | force=$1 | |
647 | ;; | |
ca2cedba | 648 | -r|--rebase) |
32948425 | 649 | update="rebase" |
ca2cedba | 650 | ;; |
d92a3959 MT |
651 | --reference) |
652 | case "$2" in '') usage ;; esac | |
653 | reference="--reference=$2" | |
98dbe63d | 654 | shift |
d92a3959 MT |
655 | ;; |
656 | --reference=*) | |
657 | reference="$1" | |
d92a3959 | 658 | ;; |
42b49178 | 659 | -m|--merge) |
42b49178 JH |
660 | update="merge" |
661 | ;; | |
b13fd5c1 | 662 | --recursive) |
b13fd5c1 JH |
663 | recursive=1 |
664 | ;; | |
efc5fb6a JH |
665 | --checkout) |
666 | update="checkout" | |
667 | ;; | |
275cd184 FG |
668 | --depth) |
669 | case "$2" in '') usage ;; esac | |
670 | depth="--depth=$2" | |
671 | shift | |
672 | ;; | |
673 | --depth=*) | |
674 | depth=$1 | |
675 | ;; | |
2335b870 SB |
676 | -j|--jobs) |
677 | case "$2" in '') usage ;; esac | |
678 | jobs="--jobs=$2" | |
679 | shift | |
680 | ;; | |
681 | --jobs=*) | |
682 | jobs=$1 | |
683 | ;; | |
5c08dbbd JH |
684 | --) |
685 | shift | |
686 | break | |
687 | ;; | |
688 | -*) | |
689 | usage | |
690 | ;; | |
691 | *) | |
692 | break | |
693 | ;; | |
694 | esac | |
98dbe63d | 695 | shift |
5c08dbbd JH |
696 | done |
697 | ||
d92a3959 MT |
698 | if test -n "$init" |
699 | then | |
700 | cmd_init "--" "$@" || return | |
701 | fi | |
702 | ||
48308681 SB |
703 | { |
704 | git submodule--helper update-clone ${GIT_QUIET:+--quiet} \ | |
705 | ${wt_prefix:+--prefix "$wt_prefix"} \ | |
706 | ${prefix:+--recursive-prefix "$prefix"} \ | |
707 | ${update:+--update "$update"} \ | |
708 | ${reference:+--reference "$reference"} \ | |
709 | ${depth:+--depth "$depth"} \ | |
2335b870 | 710 | ${jobs:+$jobs} \ |
48308681 SB |
711 | "$@" || echo "#unmatched" |
712 | } | { | |
15ffb7cd | 713 | err= |
48308681 | 714 | while read mode sha1 stage just_cloned sm_path |
70c7ac22 | 715 | do |
be9d0a3a | 716 | die_if_unmatched "$mode" |
48308681 | 717 | |
0ea306ef | 718 | name=$(git submodule--helper name "$sm_path") || exit |
5be60078 | 719 | url=$(git config submodule."$name".url) |
d851ffb9 | 720 | branch=$(get_submodule_config "$name" branch master) |
efc5fb6a JH |
721 | if ! test -z "$update" |
722 | then | |
723 | update_module=$update | |
724 | else | |
725 | update_module=$(git config submodule."$name".update) | |
a2aed08b TK |
726 | if test -z "$update_module" |
727 | then | |
728 | update_module="checkout" | |
729 | fi | |
efc5fb6a JH |
730 | fi |
731 | ||
091a6eb0 JK |
732 | displaypath=$(relative_path "$prefix$sm_path") |
733 | ||
48308681 | 734 | if test $just_cloned -eq 1 |
d851ffb9 | 735 | then |
bf2d8246 | 736 | subsha1= |
48308681 | 737 | update_module=checkout |
bf2d8246 | 738 | else |
14111fc4 | 739 | subsha1=$(sanitize_submodule_env; cd "$sm_path" && |
5be60078 | 740 | git rev-parse --verify HEAD) || |
091a6eb0 | 741 | die "$(eval_gettext "Unable to find current revision in submodule path '\$displaypath'")" |
70c7ac22 | 742 | fi |
211b7f19 | 743 | |
06b1abb5 TK |
744 | if test -n "$remote" |
745 | then | |
746 | if test -z "$nofetch" | |
747 | then | |
748 | # Fetch remote before determining tracking $sha1 | |
14111fc4 | 749 | (sanitize_submodule_env; cd "$sm_path" && git-fetch) || |
06b1abb5 TK |
750 | die "$(eval_gettext "Unable to fetch in submodule path '\$sm_path'")" |
751 | fi | |
14111fc4 JK |
752 | remote_name=$(sanitize_submodule_env; cd "$sm_path" && get_default_remote) |
753 | sha1=$(sanitize_submodule_env; cd "$sm_path" && | |
06b1abb5 TK |
754 | git rev-parse --verify "${remote_name}/${branch}") || |
755 | die "$(eval_gettext "Unable to find current ${remote_name}/${branch} revision in submodule path '\$sm_path'")" | |
756 | fi | |
757 | ||
496eeeb1 | 758 | if test "$subsha1" != "$sha1" || test -n "$force" |
70c7ac22 | 759 | then |
9db31bdf NMC |
760 | subforce=$force |
761 | # If we don't already have a -f flag and the submodule has never been checked out | |
496eeeb1 | 762 | if test -z "$subsha1" && test -z "$force" |
b9b378a0 | 763 | then |
9db31bdf | 764 | subforce="-f" |
b9b378a0 | 765 | fi |
31ca3ac3 FF |
766 | |
767 | if test -z "$nofetch" | |
768 | then | |
e5f522d6 JL |
769 | # Run fetch only if $sha1 isn't present or it |
770 | # is not reachable from a ref. | |
fb43e31f SB |
771 | is_tip_reachable "$sm_path" "$sha1" || |
772 | fetch_in_submodule "$sm_path" || | |
091a6eb0 | 773 | die "$(eval_gettext "Unable to fetch in submodule path '\$displaypath'")" |
fb43e31f SB |
774 | |
775 | # Now we tried the usual fetch, but $sha1 may | |
776 | # not be reachable from any of the refs | |
777 | is_tip_reachable "$sm_path" "$sha1" || | |
778 | fetch_in_submodule "$sm_path" "$sha1" || | |
779 | die "$(eval_gettext "Fetched in submodule path '\$displaypath', but it did not contain $sha1. Direct fetching of that commit failed.")" | |
31ca3ac3 FF |
780 | fi |
781 | ||
877449c1 | 782 | must_die_on_failure= |
32948425 | 783 | case "$update_module" in |
a2aed08b TK |
784 | checkout) |
785 | command="git checkout $subforce -q" | |
786 | die_msg="$(eval_gettext "Unable to checkout '\$sha1' in submodule path '\$displaypath'")" | |
787 | say_msg="$(eval_gettext "Submodule path '\$displaypath': checked out '\$sha1'")" | |
788 | ;; | |
32948425 JH |
789 | rebase) |
790 | command="git rebase" | |
091a6eb0 JK |
791 | die_msg="$(eval_gettext "Unable to rebase '\$sha1' in submodule path '\$displaypath'")" |
792 | say_msg="$(eval_gettext "Submodule path '\$displaypath': rebased into '\$sha1'")" | |
877449c1 | 793 | must_die_on_failure=yes |
32948425 | 794 | ;; |
42b49178 JH |
795 | merge) |
796 | command="git merge" | |
091a6eb0 JK |
797 | die_msg="$(eval_gettext "Unable to merge '\$sha1' in submodule path '\$displaypath'")" |
798 | say_msg="$(eval_gettext "Submodule path '\$displaypath': merged in '\$sha1'")" | |
877449c1 | 799 | must_die_on_failure=yes |
42b49178 | 800 | ;; |
6cb5728c CP |
801 | !*) |
802 | command="${update_module#!}" | |
b08238ac SB |
803 | die_msg="$(eval_gettext "Execution of '\$command \$sha1' failed in submodule path '\$displaypath'")" |
804 | say_msg="$(eval_gettext "Submodule path '\$displaypath': '\$command \$sha1'")" | |
6cb5728c CP |
805 | must_die_on_failure=yes |
806 | ;; | |
32948425 | 807 | *) |
a2aed08b | 808 | die "$(eval_gettext "Invalid update mode '$update_module' for submodule '$name'")" |
32948425 | 809 | esac |
70c7ac22 | 810 | |
14111fc4 | 811 | if (sanitize_submodule_env; cd "$sm_path" && $command "$sha1") |
15ffb7cd | 812 | then |
ff968f03 | 813 | say "$say_msg" |
877449c1 JH |
814 | elif test -n "$must_die_on_failure" |
815 | then | |
ff968f03 | 816 | die_with_status 2 "$die_msg" |
15ffb7cd | 817 | else |
ff968f03 | 818 | err="${err};$die_msg" |
877449c1 | 819 | continue |
15ffb7cd | 820 | fi |
70c7ac22 | 821 | fi |
b13fd5c1 JH |
822 | |
823 | if test -n "$recursive" | |
824 | then | |
75bf5e60 WE |
825 | ( |
826 | prefix="$prefix$sm_path/" | |
14111fc4 | 827 | sanitize_submodule_env |
75bf5e60 | 828 | cd "$sm_path" && |
36141282 | 829 | eval cmd_update |
75bf5e60 | 830 | ) |
15ffb7cd FG |
831 | res=$? |
832 | if test $res -gt 0 | |
833 | then | |
091a6eb0 | 834 | die_msg="$(eval_gettext "Failed to recurse into submodule path '\$displaypath'")" |
15ffb7cd FG |
835 | if test $res -eq 1 |
836 | then | |
ff968f03 | 837 | err="${err};$die_msg" |
15ffb7cd FG |
838 | continue |
839 | else | |
ff968f03 | 840 | die_with_status $res "$die_msg" |
15ffb7cd FG |
841 | fi |
842 | fi | |
b13fd5c1 | 843 | fi |
70c7ac22 | 844 | done |
15ffb7cd FG |
845 | |
846 | if test -n "$err" | |
847 | then | |
848 | OIFS=$IFS | |
849 | IFS=';' | |
850 | for e in $err | |
851 | do | |
852 | if test -n "$e" | |
853 | then | |
854 | echo >&2 "$e" | |
855 | fi | |
856 | done | |
857 | IFS=$OIFS | |
858 | exit 1 | |
859 | fi | |
860 | } | |
70c7ac22 LH |
861 | } |
862 | ||
bffe71f4 EM |
863 | set_name_rev () { |
864 | revname=$( ( | |
14111fc4 | 865 | sanitize_submodule_env |
bffe71f4 | 866 | cd "$1" && { |
5be60078 JH |
867 | git describe "$2" 2>/dev/null || |
868 | git describe --tags "$2" 2>/dev/null || | |
f669ac0b ML |
869 | git describe --contains "$2" 2>/dev/null || |
870 | git describe --all --always "$2" | |
bffe71f4 EM |
871 | } |
872 | ) ) | |
873 | test -z "$revname" || revname=" ($revname)" | |
874 | } | |
28f9af5d PY |
875 | # |
876 | # Show commit summary for submodules in index or working tree | |
877 | # | |
878 | # If '--cached' is given, show summary between index and given commit, | |
879 | # or between working tree and given commit | |
880 | # | |
881 | # $@ = [commit (default 'HEAD'),] requested paths (default all) | |
882 | # | |
883 | cmd_summary() { | |
f2dc06a3 | 884 | summary_limit=-1 |
d0f64dd4 | 885 | for_status= |
1c244f6e | 886 | diff_cmd=diff-index |
f2dc06a3 | 887 | |
28f9af5d PY |
888 | # parse $args after "submodule ... summary". |
889 | while test $# -ne 0 | |
890 | do | |
891 | case "$1" in | |
892 | --cached) | |
893 | cached="$1" | |
894 | ;; | |
1c244f6e JL |
895 | --files) |
896 | files="$1" | |
897 | ;; | |
d0f64dd4 PY |
898 | --for-status) |
899 | for_status="$1" | |
900 | ;; | |
f2dc06a3 | 901 | -n|--summary-limit) |
862ae6cd RS |
902 | summary_limit="$2" |
903 | isnumber "$summary_limit" || usage | |
f2dc06a3 PY |
904 | shift |
905 | ;; | |
862ae6cd RS |
906 | --summary-limit=*) |
907 | summary_limit="${1#--summary-limit=}" | |
908 | isnumber "$summary_limit" || usage | |
909 | ;; | |
28f9af5d PY |
910 | --) |
911 | shift | |
912 | break | |
913 | ;; | |
914 | -*) | |
915 | usage | |
916 | ;; | |
917 | *) | |
918 | break | |
919 | ;; | |
920 | esac | |
921 | shift | |
922 | done | |
bffe71f4 | 923 | |
f2dc06a3 PY |
924 | test $summary_limit = 0 && return |
925 | ||
3deea89c | 926 | if rev=$(git rev-parse -q --verify --default HEAD ${1+"$1"}) |
28f9af5d PY |
927 | then |
928 | head=$rev | |
caa9c3ca | 929 | test $# = 0 || shift |
496eeeb1 | 930 | elif test -z "$1" || test "$1" = "HEAD" |
3deea89c | 931 | then |
14e940d7 JH |
932 | # before the first commit: compare with an empty tree |
933 | head=$(git hash-object -w -t tree --stdin </dev/null) | |
2ea6c2c9 | 934 | test -z "$1" || shift |
28f9af5d | 935 | else |
3deea89c | 936 | head="HEAD" |
28f9af5d PY |
937 | fi |
938 | ||
1c244f6e JL |
939 | if [ -n "$files" ] |
940 | then | |
941 | test -n "$cached" && | |
465d6a00 | 942 | die "$(gettext "The --cached option cannot be used with the --files option")" |
1c244f6e JL |
943 | diff_cmd=diff-files |
944 | head= | |
945 | fi | |
946 | ||
28f9af5d | 947 | cd_to_toplevel |
091a6eb0 | 948 | eval "set $(git rev-parse --sq --prefix "$wt_prefix" -- "$@")" |
28f9af5d | 949 | # Get modified modules cared by user |
18076502 | 950 | modules=$(git $diff_cmd $cached --ignore-submodules=dirty --raw $head -- "$@" | |
e1622bfc | 951 | sane_egrep '^:([0-7]* )?160000' | |
2be94509 | 952 | while read mod_src mod_dst sha1_src sha1_dst status sm_path |
28f9af5d PY |
953 | do |
954 | # Always show modules deleted or type-changed (blob<->module) | |
496eeeb1 EP |
955 | if test "$status" = D || test "$status" = T |
956 | then | |
6a066230 | 957 | printf '%s\n' "$sm_path" |
496eeeb1 EP |
958 | continue |
959 | fi | |
927b26f8 | 960 | # Respect the ignore setting for --for-status. |
961 | if test -n "$for_status" | |
962 | then | |
0ea306ef | 963 | name=$(git submodule--helper name "$sm_path") |
927b26f8 | 964 | ignore_config=$(get_submodule_config "$name" ignore none) |
496eeeb1 | 965 | test $status != A && test $ignore_config = all && continue |
927b26f8 | 966 | fi |
28f9af5d | 967 | # Also show added or modified modules which are checked out |
2be94509 | 968 | GIT_DIR="$sm_path/.git" git-rev-parse --git-dir >/dev/null 2>&1 && |
6a066230 | 969 | printf '%s\n' "$sm_path" |
28f9af5d PY |
970 | done |
971 | ) | |
1cb639e6 | 972 | |
d0f64dd4 PY |
973 | test -z "$modules" && return |
974 | ||
18076502 | 975 | git $diff_cmd $cached --ignore-submodules=dirty --raw $head -- $modules | |
e1622bfc | 976 | sane_egrep '^:([0-7]* )?160000' | |
1cb639e6 PY |
977 | cut -c2- | |
978 | while read mod_src mod_dst sha1_src sha1_dst status name | |
979 | do | |
980 | if test -z "$cached" && | |
981 | test $sha1_dst = 0000000000000000000000000000000000000000 | |
982 | then | |
983 | case "$mod_dst" in | |
984 | 160000) | |
985 | sha1_dst=$(GIT_DIR="$name/.git" git rev-parse HEAD) | |
986 | ;; | |
987 | 100644 | 100755 | 120000) | |
988 | sha1_dst=$(git hash-object $name) | |
989 | ;; | |
990 | 000000) | |
991 | ;; # removed | |
992 | *) | |
993 | # unexpected type | |
6ff875c5 | 994 | eval_gettextln "unexpected mode \$mod_dst" >&2 |
1cb639e6 PY |
995 | continue ;; |
996 | esac | |
997 | fi | |
998 | missing_src= | |
999 | missing_dst= | |
1000 | ||
1001 | test $mod_src = 160000 && | |
30353a40 | 1002 | ! GIT_DIR="$name/.git" git-rev-parse -q --verify $sha1_src^0 >/dev/null && |
1cb639e6 PY |
1003 | missing_src=t |
1004 | ||
1005 | test $mod_dst = 160000 && | |
30353a40 | 1006 | ! GIT_DIR="$name/.git" git-rev-parse -q --verify $sha1_dst^0 >/dev/null && |
1cb639e6 | 1007 | missing_dst=t |
bffe71f4 | 1008 | |
091a6eb0 JK |
1009 | display_name=$(relative_path "$name") |
1010 | ||
1cb639e6 PY |
1011 | total_commits= |
1012 | case "$missing_src,$missing_dst" in | |
1013 | t,) | |
091a6eb0 | 1014 | errmsg="$(eval_gettext " Warn: \$display_name doesn't contain commit \$sha1_src")" |
1cb639e6 PY |
1015 | ;; |
1016 | ,t) | |
091a6eb0 | 1017 | errmsg="$(eval_gettext " Warn: \$display_name doesn't contain commit \$sha1_dst")" |
1cb639e6 PY |
1018 | ;; |
1019 | t,t) | |
091a6eb0 | 1020 | errmsg="$(eval_gettext " Warn: \$display_name doesn't contain commits \$sha1_src and \$sha1_dst")" |
1cb639e6 PY |
1021 | ;; |
1022 | *) | |
1023 | errmsg= | |
1024 | total_commits=$( | |
496eeeb1 | 1025 | if test $mod_src = 160000 && test $mod_dst = 160000 |
1cb639e6 PY |
1026 | then |
1027 | range="$sha1_src...$sha1_dst" | |
1028 | elif test $mod_src = 160000 | |
1029 | then | |
1030 | range=$sha1_src | |
1031 | else | |
1032 | range=$sha1_dst | |
1033 | fi | |
1034 | GIT_DIR="$name/.git" \ | |
b0e621ad | 1035 | git rev-list --first-parent $range -- | wc -l |
1cb639e6 | 1036 | ) |
eed35595 | 1037 | total_commits=" ($(($total_commits + 0)))" |
1cb639e6 PY |
1038 | ;; |
1039 | esac | |
1040 | ||
1041 | sha1_abbr_src=$(echo $sha1_src | cut -c1-7) | |
1042 | sha1_abbr_dst=$(echo $sha1_dst | cut -c1-7) | |
1043 | if test $status = T | |
1044 | then | |
b3e73449 ÆAB |
1045 | blob="$(gettext "blob")" |
1046 | submodule="$(gettext "submodule")" | |
1cb639e6 PY |
1047 | if test $mod_dst = 160000 |
1048 | then | |
091a6eb0 | 1049 | echo "* $display_name $sha1_abbr_src($blob)->$sha1_abbr_dst($submodule)$total_commits:" |
1cb639e6 | 1050 | else |
091a6eb0 | 1051 | echo "* $display_name $sha1_abbr_src($submodule)->$sha1_abbr_dst($blob)$total_commits:" |
1cb639e6 PY |
1052 | fi |
1053 | else | |
091a6eb0 | 1054 | echo "* $display_name $sha1_abbr_src...$sha1_abbr_dst$total_commits:" |
1cb639e6 PY |
1055 | fi |
1056 | if test -n "$errmsg" | |
1057 | then | |
1058 | # Don't give error msg for modification whose dst is not submodule | |
1059 | # i.e. deleted or changed to blob | |
1060 | test $mod_dst = 160000 && echo "$errmsg" | |
1061 | else | |
496eeeb1 | 1062 | if test $mod_src = 160000 && test $mod_dst = 160000 |
1cb639e6 | 1063 | then |
f2dc06a3 PY |
1064 | limit= |
1065 | test $summary_limit -gt 0 && limit="-$summary_limit" | |
1cb639e6 | 1066 | GIT_DIR="$name/.git" \ |
f2dc06a3 | 1067 | git log $limit --pretty='format: %m %s' \ |
1cb639e6 PY |
1068 | --first-parent $sha1_src...$sha1_dst |
1069 | elif test $mod_dst = 160000 | |
1070 | then | |
1071 | GIT_DIR="$name/.git" \ | |
1072 | git log --pretty='format: > %s' -1 $sha1_dst | |
1073 | else | |
1074 | GIT_DIR="$name/.git" \ | |
1075 | git log --pretty='format: < %s' -1 $sha1_src | |
1076 | fi | |
1077 | echo | |
1078 | fi | |
1079 | echo | |
3ba7407b | 1080 | done |
28f9af5d | 1081 | } |
70c7ac22 | 1082 | # |
941987a5 | 1083 | # List all submodules, prefixed with: |
70c7ac22 LH |
1084 | # - submodule not initialized |
1085 | # + different revision checked out | |
1086 | # | |
1087 | # If --cached was specified the revision in the index will be printed | |
1088 | # instead of the currently checked out revision. | |
1089 | # | |
1090 | # $@ = requested paths (default to all) | |
1091 | # | |
23a485e3 | 1092 | cmd_status() |
70c7ac22 | 1093 | { |
5c08dbbd JH |
1094 | # parse $args after "submodule ... status". |
1095 | while test $# -ne 0 | |
1096 | do | |
1097 | case "$1" in | |
1098 | -q|--quiet) | |
2e6a30ef | 1099 | GIT_QUIET=1 |
5c08dbbd JH |
1100 | ;; |
1101 | --cached) | |
1102 | cached=1 | |
1103 | ;; | |
64b19ffe JH |
1104 | --recursive) |
1105 | recursive=1 | |
1106 | ;; | |
5c08dbbd JH |
1107 | --) |
1108 | shift | |
1109 | break | |
1110 | ;; | |
1111 | -*) | |
1112 | usage | |
1113 | ;; | |
1114 | *) | |
1115 | break | |
1116 | ;; | |
1117 | esac | |
1118 | shift | |
1119 | done | |
1120 | ||
74703a1e | 1121 | git submodule--helper list --prefix "$wt_prefix" "$@" | |
64394e3a | 1122 | while read mode sha1 stage sm_path |
70c7ac22 | 1123 | do |
be9d0a3a | 1124 | die_if_unmatched "$mode" |
0ea306ef | 1125 | name=$(git submodule--helper name "$sm_path") || exit |
5be60078 | 1126 | url=$(git config submodule."$name".url) |
091a6eb0 | 1127 | displaypath=$(relative_path "$prefix$sm_path") |
313ee0d6 NMC |
1128 | if test "$stage" = U |
1129 | then | |
1130 | say "U$sha1 $displaypath" | |
1131 | continue | |
1132 | fi | |
496eeeb1 EP |
1133 | if test -z "$url" || |
1134 | { | |
1135 | ! test -d "$sm_path"/.git && | |
1136 | ! test -f "$sm_path"/.git | |
1137 | } | |
70c7ac22 | 1138 | then |
64b19ffe | 1139 | say "-$sha1 $displaypath" |
70c7ac22 LH |
1140 | continue; |
1141 | fi | |
64394e3a | 1142 | if git diff-files --ignore-submodules=dirty --quiet -- "$sm_path" |
70c7ac22 | 1143 | then |
b545cd15 | 1144 | set_name_rev "$sm_path" "$sha1" |
64b19ffe | 1145 | say " $sha1 $displaypath$revname" |
70c7ac22 LH |
1146 | else |
1147 | if test -z "$cached" | |
1148 | then | |
14111fc4 | 1149 | sha1=$(sanitize_submodule_env; cd "$sm_path" && git rev-parse --verify HEAD) |
70c7ac22 | 1150 | fi |
b545cd15 | 1151 | set_name_rev "$sm_path" "$sha1" |
64b19ffe JH |
1152 | say "+$sha1 $displaypath$revname" |
1153 | fi | |
1154 | ||
1155 | if test -n "$recursive" | |
1156 | then | |
1157 | ( | |
1158 | prefix="$displaypath/" | |
14111fc4 | 1159 | sanitize_submodule_env |
10450cf7 | 1160 | wt_prefix= |
64394e3a | 1161 | cd "$sm_path" && |
e15bec0e | 1162 | eval cmd_status |
64b19ffe | 1163 | ) || |
64394e3a | 1164 | die "$(eval_gettext "Failed to recurse into submodule path '\$sm_path'")" |
70c7ac22 LH |
1165 | fi |
1166 | done | |
1167 | } | |
2327f61e DA |
1168 | # |
1169 | # Sync remote urls for submodules | |
1170 | # This makes the value for remote.$remote.url match the value | |
1171 | # specified in .gitmodules. | |
1172 | # | |
1173 | cmd_sync() | |
1174 | { | |
1175 | while test $# -ne 0 | |
1176 | do | |
1177 | case "$1" in | |
1178 | -q|--quiet) | |
2e6a30ef | 1179 | GIT_QUIET=1 |
2327f61e DA |
1180 | shift |
1181 | ;; | |
82f49f29 PH |
1182 | --recursive) |
1183 | recursive=1 | |
1184 | shift | |
1185 | ;; | |
2327f61e DA |
1186 | --) |
1187 | shift | |
1188 | break | |
1189 | ;; | |
1190 | -*) | |
1191 | usage | |
1192 | ;; | |
1193 | *) | |
1194 | break | |
1195 | ;; | |
1196 | esac | |
1197 | done | |
1198 | cd_to_toplevel | |
74703a1e | 1199 | git submodule--helper list --prefix "$wt_prefix" "$@" | |
64394e3a | 1200 | while read mode sha1 stage sm_path |
2327f61e | 1201 | do |
be9d0a3a | 1202 | die_if_unmatched "$mode" |
0ea306ef | 1203 | name=$(git submodule--helper name "$sm_path") |
2327f61e | 1204 | url=$(git config -f .gitmodules --get submodule."$name".url) |
baede9f8 JH |
1205 | |
1206 | # Possibly a url relative to parent | |
1207 | case "$url" in | |
1208 | ./*|../*) | |
967b2c66 JS |
1209 | # rewrite foo/bar as ../.. to find path from |
1210 | # submodule work tree to superproject work tree | |
6a066230 | 1211 | up_path="$(printf '%s\n' "$sm_path" | sed "s/[^/][^/]*/../g")" && |
967b2c66 JS |
1212 | # guarantee a trailing / |
1213 | up_path=${up_path%/}/ && | |
1214 | # path from submodule work tree to submodule origin repo | |
1215 | sub_origin_url=$(resolve_relative_url "$url" "$up_path") && | |
1216 | # path from superproject work tree to submodule origin repo | |
1217 | super_config_url=$(resolve_relative_url "$url") || exit | |
1218 | ;; | |
1219 | *) | |
1220 | sub_origin_url="$url" | |
1221 | super_config_url="$url" | |
baede9f8 JH |
1222 | ;; |
1223 | esac | |
1224 | ||
ccee6086 | 1225 | if git config "submodule.$name.url" >/dev/null 2>/dev/null |
2327f61e | 1226 | then |
091a6eb0 JK |
1227 | displaypath=$(relative_path "$prefix$sm_path") |
1228 | say "$(eval_gettext "Synchronizing submodule url for '\$displaypath'")" | |
967b2c66 | 1229 | git config submodule."$name".url "$super_config_url" |
ccee6086 | 1230 | |
64394e3a | 1231 | if test -e "$sm_path"/.git |
ccee6086 JH |
1232 | then |
1233 | ( | |
14111fc4 | 1234 | sanitize_submodule_env |
64394e3a | 1235 | cd "$sm_path" |
ccee6086 | 1236 | remote=$(get_default_remote) |
967b2c66 | 1237 | git config remote."$remote".url "$sub_origin_url" |
82f49f29 PH |
1238 | |
1239 | if test -n "$recursive" | |
1240 | then | |
1241 | prefix="$prefix$sm_path/" | |
1242 | eval cmd_sync | |
1243 | fi | |
ccee6086 JH |
1244 | ) |
1245 | fi | |
2327f61e DA |
1246 | fi |
1247 | done | |
1248 | } | |
70c7ac22 | 1249 | |
5c08dbbd JH |
1250 | # This loop parses the command line arguments to find the |
1251 | # subcommand name to dispatch. Parsing of the subcommand specific | |
1252 | # options are primarily done by the subcommand implementations. | |
1253 | # Subcommand specific options such as --branch and --cached are | |
1254 | # parsed here as well, for backward compatibility. | |
1255 | ||
1256 | while test $# != 0 && test -z "$command" | |
70c7ac22 LH |
1257 | do |
1258 | case "$1" in | |
cf419828 | 1259 | add | foreach | init | deinit | update | status | summary | sync) |
5c08dbbd | 1260 | command=$1 |
70c7ac22 LH |
1261 | ;; |
1262 | -q|--quiet) | |
2e6a30ef | 1263 | GIT_QUIET=1 |
70c7ac22 | 1264 | ;; |
ecda0723 SV |
1265 | -b|--branch) |
1266 | case "$2" in | |
1267 | '') | |
1268 | usage | |
1269 | ;; | |
1270 | esac | |
1271 | branch="$2"; shift | |
1272 | ;; | |
70c7ac22 | 1273 | --cached) |
28f9af5d | 1274 | cached="$1" |
70c7ac22 LH |
1275 | ;; |
1276 | --) | |
1277 | break | |
1278 | ;; | |
1279 | -*) | |
1280 | usage | |
1281 | ;; | |
1282 | *) | |
1283 | break | |
1284 | ;; | |
1285 | esac | |
1286 | shift | |
1287 | done | |
1288 | ||
5c08dbbd | 1289 | # No command word defaults to "status" |
af9c9f97 RR |
1290 | if test -z "$command" |
1291 | then | |
1292 | if test $# = 0 | |
1293 | then | |
1294 | command=status | |
1295 | else | |
1296 | usage | |
1297 | fi | |
1298 | fi | |
5c08dbbd JH |
1299 | |
1300 | # "-b branch" is accepted only by "add" | |
1301 | if test -n "$branch" && test "$command" != add | |
1302 | then | |
ecda0723 | 1303 | usage |
5c08dbbd JH |
1304 | fi |
1305 | ||
28f9af5d | 1306 | # "--cached" is accepted only by "status" and "summary" |
496eeeb1 | 1307 | if test -n "$cached" && test "$command" != status && test "$command" != summary |
5c08dbbd | 1308 | then |
70c7ac22 | 1309 | usage |
5c08dbbd JH |
1310 | fi |
1311 | ||
1312 | "cmd_$command" "$@" |