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