]>
Commit | Line | Data |
---|---|---|
70c7ac22 LH |
1 | #!/bin/sh |
2 | # | |
ecda0723 | 3 | # git-submodules.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/-/ /') |
d27b876b | 8 | USAGE="[--quiet] add [-b branch] [-f|--force] [--reference <repository>] [--] <repository> [<path>] |
64b19ffe | 9 | or: $dashless [--quiet] status [--cached] [--recursive] [--] [<path>...] |
1d5bec8b | 10 | or: $dashless [--quiet] init [--] [<path>...] |
9db31bdf | 11 | or: $dashless [--quiet] update [--init] [-N|--no-fetch] [-f|--force] [--rebase] [--reference <repository>] [--merge] [--recursive] [--] [<path>...] |
adc54235 | 12 | or: $dashless [--quiet] summary [--cached|--files] [--summary-limit <n>] [commit] [--] [<path>...] |
15fc56a8 | 13 | or: $dashless [--quiet] foreach [--recursive] <command> |
1d5bec8b | 14 | or: $dashless [--quiet] sync [--] [<path>...]" |
8f321a39 | 15 | OPTIONS_SPEC= |
70c7ac22 | 16 | . git-sh-setup |
d0ad8251 | 17 | . git-sh-i18n |
98fcf840 | 18 | . git-parse-remote |
70c7ac22 LH |
19 | require_work_tree |
20 | ||
5c08dbbd | 21 | command= |
ecda0723 | 22 | branch= |
d27b876b | 23 | force= |
d92a3959 | 24 | reference= |
70c7ac22 | 25 | cached= |
48bb3033 GP |
26 | recursive= |
27 | init= | |
1c244f6e | 28 | files= |
31ca3ac3 | 29 | nofetch= |
32948425 | 30 | update= |
15fc56a8 | 31 | prefix= |
70c7ac22 | 32 | |
f31a522a ML |
33 | # Resolve relative url by appending to parent's url |
34 | resolve_relative_url () | |
35 | { | |
98fcf840 | 36 | remote=$(get_default_remote) |
8e7e6f39 | 37 | remoteurl=$(git config "remote.$remote.url") || |
4d689320 | 38 | remoteurl=$(pwd) # the repository is its own authoritative upstream |
f31a522a | 39 | url="$1" |
99b120af | 40 | remoteurl=${remoteurl%/} |
ea640cc6 | 41 | sep=/ |
f31a522a ML |
42 | while test -n "$url" |
43 | do | |
44 | case "$url" in | |
45 | ../*) | |
46 | url="${url#../}" | |
ea640cc6 TR |
47 | case "$remoteurl" in |
48 | */*) | |
49 | remoteurl="${remoteurl%/*}" | |
50 | ;; | |
51 | *:*) | |
52 | remoteurl="${remoteurl%:*}" | |
53 | sep=: | |
54 | ;; | |
55 | *) | |
497ee872 | 56 | die "$(eval_gettext "cannot strip one component off url '\$remoteurl'")" |
ea640cc6 TR |
57 | ;; |
58 | esac | |
f31a522a ML |
59 | ;; |
60 | ./*) | |
61 | url="${url#./}" | |
62 | ;; | |
63 | *) | |
64 | break;; | |
65 | esac | |
66 | done | |
ea640cc6 | 67 | echo "$remoteurl$sep${url%/}" |
f31a522a ML |
68 | } |
69 | ||
a7b3269c DA |
70 | # |
71 | # Get submodule info for registered submodules | |
72 | # $@ = path to limit submodule list | |
73 | # | |
74 | module_list() | |
75 | { | |
313ee0d6 NMC |
76 | git ls-files --error-unmatch --stage -- "$@" | |
77 | perl -e ' | |
78 | my %unmerged = (); | |
79 | my ($null_sha1) = ("0" x 40); | |
80 | while (<STDIN>) { | |
81 | chomp; | |
82 | my ($mode, $sha1, $stage, $path) = | |
83 | /^([0-7]+) ([0-9a-f]{40}) ([0-3])\t(.*)$/; | |
84 | next unless $mode eq "160000"; | |
85 | if ($stage ne "0") { | |
86 | if (!$unmerged{$path}++) { | |
87 | print "$mode $null_sha1 U\t$path\n"; | |
88 | } | |
89 | next; | |
90 | } | |
91 | print "$_\n"; | |
92 | } | |
93 | ' | |
a7b3269c DA |
94 | } |
95 | ||
941987a5 LH |
96 | # |
97 | # Map submodule path to submodule name | |
98 | # | |
99 | # $1 = path | |
100 | # | |
101 | module_name() | |
102 | { | |
537601ac | 103 | # Do we have "submodule.<something>.path = $1" defined in .gitmodules file? |
fe22e542 | 104 | re=$(printf '%s\n' "$1" | sed -e 's/[].[^$\\*]/\\&/g') |
a5099bb4 | 105 | name=$( git config -f .gitmodules --get-regexp '^submodule\..*\.path$' | |
537601ac | 106 | sed -n -e 's|^submodule\.\(.*\)\.path '"$re"'$|\1|p' ) |
1e42258a TRC |
107 | test -z "$name" && |
108 | die "$(eval_gettext "No submodule mapping found in .gitmodules for path '\$path'")" | |
109 | echo "$name" | |
941987a5 | 110 | } |
33aa6fff LH |
111 | |
112 | # | |
113 | # Clone a submodule | |
114 | # | |
23a485e3 | 115 | # Prior to calling, cmd_update checks that a possibly existing |
ecda0723 | 116 | # path is not a git repository. |
23a485e3 | 117 | # Likewise, cmd_add checks that path does not exist at all, |
ecda0723 SV |
118 | # since it is the location of a new submodule. |
119 | # | |
33aa6fff LH |
120 | module_clone() |
121 | { | |
122 | path=$1 | |
123 | url=$2 | |
d92a3959 | 124 | reference="$3" |
7e60407f JL |
125 | quiet= |
126 | if test -n "$GIT_QUIET" | |
127 | then | |
128 | quiet=-q | |
129 | fi | |
33aa6fff | 130 | |
501770e1 FG |
131 | gitdir= |
132 | gitdir_base= | |
9e76d4a8 | 133 | name=$(module_name "$path" 2>/dev/null) |
1017c1ab | 134 | test -n "$name" || name="$path" |
501770e1 | 135 | base_path=$(dirname "$path") |
33aa6fff | 136 | |
501770e1 FG |
137 | gitdir=$(git rev-parse --git-dir) |
138 | gitdir_base="$gitdir/modules/$base_path" | |
139 | gitdir="$gitdir/modules/$path" | |
140 | ||
141 | case $gitdir in | |
142 | /*) | |
143 | a="$(cd_to_toplevel && pwd)/" | |
144 | b=$gitdir | |
145 | while [ "$b" ] && [ "${a%%/*}" = "${b%%/*}" ] | |
146 | do | |
147 | a=${a#*/} b=${b#*/}; | |
148 | done | |
149 | ||
150 | rel="$a$name" | |
151 | rel=`echo $rel | sed -e 's|[^/]*|..|g'` | |
152 | rel_gitdir="$rel/$b" | |
153 | ;; | |
154 | *) | |
155 | rel=`echo $name | sed -e 's|[^/]*|..|g'` | |
156 | rel_gitdir="$rel/$gitdir" | |
157 | ;; | |
158 | esac | |
159 | ||
160 | if test -d "$gitdir" | |
d92a3959 | 161 | then |
501770e1 FG |
162 | mkdir -p "$path" |
163 | echo "gitdir: $rel_gitdir" >"$path/.git" | |
164 | rm -f "$gitdir/index" | |
d92a3959 | 165 | else |
501770e1 FG |
166 | mkdir -p "$gitdir_base" |
167 | if test -n "$reference" | |
168 | then | |
efc5fb6a | 169 | git-clone $quiet "$reference" -n "$url" "$path" --separate-git-dir "$gitdir" |
501770e1 | 170 | else |
efc5fb6a | 171 | git-clone $quiet -n "$url" "$path" --separate-git-dir "$gitdir" |
501770e1 FG |
172 | fi || |
173 | die "$(eval_gettext "Clone of '\$url' into submodule path '\$path' failed")" | |
174 | fi | |
33aa6fff LH |
175 | } |
176 | ||
ecda0723 SV |
177 | # |
178 | # Add a new submodule to the working tree, .gitmodules and the index | |
179 | # | |
ec05df35 | 180 | # $@ = repo path |
ecda0723 SV |
181 | # |
182 | # optional branch is stored in global branch variable | |
183 | # | |
23a485e3 | 184 | cmd_add() |
ecda0723 | 185 | { |
5c08dbbd JH |
186 | # parse $args after "submodule ... add". |
187 | while test $# -ne 0 | |
188 | do | |
189 | case "$1" in | |
190 | -b | --branch) | |
191 | case "$2" in '') usage ;; esac | |
192 | branch=$2 | |
193 | shift | |
194 | ;; | |
d27b876b JL |
195 | -f | --force) |
196 | force=$1 | |
197 | ;; | |
5c08dbbd | 198 | -q|--quiet) |
2e6a30ef | 199 | GIT_QUIET=1 |
5c08dbbd | 200 | ;; |
d92a3959 MT |
201 | --reference) |
202 | case "$2" in '') usage ;; esac | |
203 | reference="--reference=$2" | |
204 | shift | |
205 | ;; | |
206 | --reference=*) | |
207 | reference="$1" | |
208 | shift | |
209 | ;; | |
5c08dbbd JH |
210 | --) |
211 | shift | |
212 | break | |
213 | ;; | |
214 | -*) | |
215 | usage | |
216 | ;; | |
217 | *) | |
218 | break | |
219 | ;; | |
220 | esac | |
221 | shift | |
222 | done | |
223 | ||
ecda0723 SV |
224 | repo=$1 |
225 | path=$2 | |
226 | ||
1414e578 JL |
227 | if test -z "$path"; then |
228 | path=$(echo "$repo" | | |
229 | sed -e 's|/$||' -e 's|:*/*\.git$||' -e 's|.*[/:]||g') | |
230 | fi | |
231 | ||
ec05df35 | 232 | if test -z "$repo" -o -z "$path"; then |
ecda0723 SV |
233 | usage |
234 | fi | |
235 | ||
ec05df35 ML |
236 | # assure repo is absolute or relative to parent |
237 | case "$repo" in | |
238 | ./*|../*) | |
239 | # dereference source url relative to parent's url | |
240 | realrepo=$(resolve_relative_url "$repo") || exit | |
241 | ;; | |
242 | *:*|/*) | |
243 | # absolute url | |
244 | realrepo=$repo | |
245 | ;; | |
246 | *) | |
497ee872 | 247 | die "$(eval_gettext "repo URL: '\$repo' must be absolute or begin with ./|../")" |
ec05df35 ML |
248 | ;; |
249 | esac | |
250 | ||
db75ada5 MG |
251 | # normalize path: |
252 | # multiple //; leading ./; /./; /../; trailing / | |
253 | path=$(printf '%s/\n' "$path" | | |
254 | sed -e ' | |
255 | s|//*|/|g | |
256 | s|^\(\./\)*|| | |
257 | s|/\./|/|g | |
258 | :start | |
259 | s|\([^/]*\)/\.\./|| | |
260 | tstart | |
261 | s|/*$|| | |
262 | ') | |
5be60078 | 263 | git ls-files --error-unmatch "$path" > /dev/null 2>&1 && |
497ee872 | 264 | die "$(eval_gettext "'\$path' already exists in the index")" |
ecda0723 | 265 | |
d27b876b JL |
266 | if test -z "$force" && ! git add --dry-run --ignore-missing "$path" > /dev/null 2>&1 |
267 | then | |
6ff875c5 | 268 | eval_gettextln "The following path is ignored by one of your .gitignore files: |
3a4c3ed7 | 269 | \$path |
6ff875c5 | 270 | Use -f if you really want to add it." >&2 |
d27b876b JL |
271 | exit 1 |
272 | fi | |
273 | ||
d4264ca3 ML |
274 | # perhaps the path exists and is already a git repo, else clone it |
275 | if test -e "$path" | |
276 | then | |
e9656473 | 277 | if test -d "$path"/.git -o -f "$path"/.git |
d4264ca3 | 278 | then |
6ff875c5 | 279 | eval_gettextln "Adding existing repo at '\$path' to the index" |
d4264ca3 | 280 | else |
497ee872 | 281 | die "$(eval_gettext "'\$path' already exists and is not a valid git repo")" |
d4264ca3 | 282 | fi |
c2f93917 | 283 | |
d4264ca3 | 284 | else |
d4264ca3 | 285 | |
d92a3959 | 286 | module_clone "$path" "$realrepo" "$reference" || exit |
ea10b60c | 287 | ( |
74ae1419 | 288 | clear_local_git_env |
ea10b60c BJ |
289 | cd "$path" && |
290 | # ash fails to wordsplit ${branch:+-b "$branch"...} | |
291 | case "$branch" in | |
292 | '') git checkout -f -q ;; | |
502dc5b6 | 293 | ?*) git checkout -f -q -B "$branch" "origin/$branch" ;; |
ea10b60c | 294 | esac |
497ee872 | 295 | ) || die "$(eval_gettext "Unable to checkout submodule '\$path'")" |
d4264ca3 | 296 | fi |
c56dce3b | 297 | git config submodule."$path".url "$realrepo" |
d4264ca3 | 298 | |
d27b876b | 299 | git add $force "$path" || |
497ee872 | 300 | die "$(eval_gettext "Failed to add submodule '\$path'")" |
ecda0723 | 301 | |
a5099bb4 IY |
302 | git config -f .gitmodules submodule."$path".path "$path" && |
303 | git config -f .gitmodules submodule."$path".url "$repo" && | |
31991b02 | 304 | git add --force .gitmodules || |
497ee872 | 305 | die "$(eval_gettext "Failed to register submodule '\$path'")" |
ecda0723 SV |
306 | } |
307 | ||
19a31f9c ML |
308 | # |
309 | # Execute an arbitrary command sequence in each checked out | |
310 | # submodule | |
311 | # | |
312 | # $@ = command to execute | |
313 | # | |
314 | cmd_foreach() | |
315 | { | |
1d5bec8b JH |
316 | # parse $args after "submodule ... foreach". |
317 | while test $# -ne 0 | |
318 | do | |
319 | case "$1" in | |
320 | -q|--quiet) | |
321 | GIT_QUIET=1 | |
322 | ;; | |
15fc56a8 JH |
323 | --recursive) |
324 | recursive=1 | |
325 | ;; | |
1d5bec8b JH |
326 | -*) |
327 | usage | |
328 | ;; | |
329 | *) | |
330 | break | |
331 | ;; | |
332 | esac | |
333 | shift | |
334 | done | |
335 | ||
f030c96d ÆAB |
336 | toplevel=$(pwd) |
337 | ||
4dca1aa6 BC |
338 | # dup stdin so that it can be restored when running the external |
339 | # command in the subshell (and a recursive call to this function) | |
340 | exec 3<&0 | |
341 | ||
a7b3269c | 342 | module_list | |
19a31f9c ML |
343 | while read mode sha1 stage path |
344 | do | |
345 | if test -e "$path"/.git | |
346 | then | |
490b6d57 | 347 | say "$(eval_gettext "Entering '\$prefix\$path'")" |
1e7f2aad | 348 | name=$(module_name "$path") |
15fc56a8 JH |
349 | ( |
350 | prefix="$prefix$path/" | |
74ae1419 | 351 | clear_local_git_env |
15fc56a8 JH |
352 | cd "$path" && |
353 | eval "$@" && | |
354 | if test -n "$recursive" | |
355 | then | |
356 | cmd_foreach "--recursive" "$@" | |
357 | fi | |
4dca1aa6 | 358 | ) <&3 3<&- || |
497ee872 | 359 | die "$(eval_gettext "Stopping at '\$path'; script returned non-zero status.")" |
19a31f9c ML |
360 | fi |
361 | done | |
362 | } | |
363 | ||
70c7ac22 | 364 | # |
211b7f19 | 365 | # Register submodules in .git/config |
70c7ac22 LH |
366 | # |
367 | # $@ = requested paths (default to all) | |
368 | # | |
23a485e3 | 369 | cmd_init() |
70c7ac22 | 370 | { |
5c08dbbd JH |
371 | # parse $args after "submodule ... init". |
372 | while test $# -ne 0 | |
373 | do | |
374 | case "$1" in | |
375 | -q|--quiet) | |
2e6a30ef | 376 | GIT_QUIET=1 |
5c08dbbd JH |
377 | ;; |
378 | --) | |
379 | shift | |
380 | break | |
381 | ;; | |
382 | -*) | |
383 | usage | |
384 | ;; | |
385 | *) | |
386 | break | |
387 | ;; | |
388 | esac | |
389 | shift | |
390 | done | |
391 | ||
a7b3269c | 392 | module_list "$@" | |
70c7ac22 LH |
393 | while read mode sha1 stage path |
394 | do | |
211b7f19 | 395 | # Skip already registered paths |
941987a5 | 396 | name=$(module_name "$path") || exit |
2cd9de3e JL |
397 | if test -z "$(git config "submodule.$name.url")" |
398 | then | |
399 | url=$(git config -f .gitmodules submodule."$name".url) | |
400 | test -z "$url" && | |
0591c0a5 | 401 | die "$(eval_gettext "No url found for submodule path '\$path' in .gitmodules")" |
2cd9de3e JL |
402 | |
403 | # Possibly a url relative to parent | |
404 | case "$url" in | |
405 | ./*|../*) | |
406 | url=$(resolve_relative_url "$url") || exit | |
407 | ;; | |
408 | esac | |
409 | git config submodule."$name".url "$url" || | |
0591c0a5 | 410 | die "$(eval_gettext "Failed to register url for submodule path '\$path'")" |
2cd9de3e | 411 | fi |
70c7ac22 | 412 | |
2cd9de3e | 413 | # Copy "update" setting when it is not set yet |
32948425 JH |
414 | upd="$(git config -f .gitmodules submodule."$name".update)" |
415 | test -z "$upd" || | |
2cd9de3e | 416 | test -n "$(git config submodule."$name".update)" || |
32948425 | 417 | git config submodule."$name".update "$upd" || |
497ee872 | 418 | die "$(eval_gettext "Failed to register update mode for submodule path '\$path'")" |
ca2cedba | 419 | |
497ee872 | 420 | say "$(eval_gettext "Submodule '\$name' (\$url) registered for path '\$path'")" |
70c7ac22 LH |
421 | done |
422 | } | |
423 | ||
424 | # | |
211b7f19 | 425 | # Update each submodule path to correct revision, using clone and checkout as needed |
70c7ac22 LH |
426 | # |
427 | # $@ = requested paths (default to all) | |
428 | # | |
23a485e3 | 429 | cmd_update() |
70c7ac22 | 430 | { |
5c08dbbd | 431 | # parse $args after "submodule ... update". |
98dbe63d | 432 | orig_flags= |
5c08dbbd JH |
433 | while test $# -ne 0 |
434 | do | |
435 | case "$1" in | |
436 | -q|--quiet) | |
2e6a30ef | 437 | GIT_QUIET=1 |
5c08dbbd | 438 | ;; |
be4d2c83 | 439 | -i|--init) |
d92a3959 | 440 | init=1 |
be4d2c83 | 441 | ;; |
31ca3ac3 | 442 | -N|--no-fetch) |
31ca3ac3 FF |
443 | nofetch=1 |
444 | ;; | |
9db31bdf NMC |
445 | -f|--force) |
446 | force=$1 | |
447 | ;; | |
ca2cedba | 448 | -r|--rebase) |
32948425 | 449 | update="rebase" |
ca2cedba | 450 | ;; |
d92a3959 MT |
451 | --reference) |
452 | case "$2" in '') usage ;; esac | |
453 | reference="--reference=$2" | |
98dbe63d KB |
454 | orig_flags="$orig_flags $(git rev-parse --sq-quote "$1")" |
455 | shift | |
d92a3959 MT |
456 | ;; |
457 | --reference=*) | |
458 | reference="$1" | |
d92a3959 | 459 | ;; |
42b49178 | 460 | -m|--merge) |
42b49178 JH |
461 | update="merge" |
462 | ;; | |
b13fd5c1 | 463 | --recursive) |
b13fd5c1 JH |
464 | recursive=1 |
465 | ;; | |
efc5fb6a JH |
466 | --checkout) |
467 | update="checkout" | |
468 | ;; | |
5c08dbbd JH |
469 | --) |
470 | shift | |
471 | break | |
472 | ;; | |
473 | -*) | |
474 | usage | |
475 | ;; | |
476 | *) | |
477 | break | |
478 | ;; | |
479 | esac | |
98dbe63d KB |
480 | orig_flags="$orig_flags $(git rev-parse --sq-quote "$1")" |
481 | shift | |
5c08dbbd JH |
482 | done |
483 | ||
d92a3959 MT |
484 | if test -n "$init" |
485 | then | |
486 | cmd_init "--" "$@" || return | |
487 | fi | |
488 | ||
1b4735d9 | 489 | cloned_modules= |
15ffb7cd FG |
490 | module_list "$@" | { |
491 | err= | |
70c7ac22 LH |
492 | while read mode sha1 stage path |
493 | do | |
313ee0d6 NMC |
494 | if test "$stage" = U |
495 | then | |
496 | echo >&2 "Skipping unmerged submodule $path" | |
497 | continue | |
498 | fi | |
941987a5 | 499 | name=$(module_name "$path") || exit |
5be60078 | 500 | url=$(git config submodule."$name".url) |
efc5fb6a JH |
501 | if ! test -z "$update" |
502 | then | |
503 | update_module=$update | |
504 | else | |
505 | update_module=$(git config submodule."$name".update) | |
506 | fi | |
507 | ||
508 | if test "$update_module" = "none" | |
509 | then | |
510 | echo "Skipping submodule '$path'" | |
511 | continue | |
512 | fi | |
513 | ||
211b7f19 | 514 | if test -z "$url" |
70c7ac22 LH |
515 | then |
516 | # Only mention uninitialized submodules when its | |
517 | # path have been specified | |
518 | test "$#" != "0" && | |
1c2ef66f ÆAB |
519 | say "$(eval_gettext "Submodule path '\$path' not initialized |
520 | Maybe you want to use 'update --init'?")" | |
211b7f19 LH |
521 | continue |
522 | fi | |
523 | ||
ba88a1fe | 524 | if ! test -d "$path"/.git -o -f "$path"/.git |
211b7f19 | 525 | then |
d92a3959 | 526 | module_clone "$path" "$url" "$reference"|| exit |
1b4735d9 | 527 | cloned_modules="$cloned_modules;$name" |
bf2d8246 LH |
528 | subsha1= |
529 | else | |
74ae1419 | 530 | subsha1=$(clear_local_git_env; cd "$path" && |
5be60078 | 531 | git rev-parse --verify HEAD) || |
497ee872 | 532 | die "$(eval_gettext "Unable to find current revision in submodule path '\$path'")" |
70c7ac22 | 533 | fi |
211b7f19 | 534 | |
70c7ac22 LH |
535 | if test "$subsha1" != "$sha1" |
536 | then | |
9db31bdf NMC |
537 | subforce=$force |
538 | # If we don't already have a -f flag and the submodule has never been checked out | |
539 | if test -z "$subsha1" -a -z "$force" | |
b9b378a0 | 540 | then |
9db31bdf | 541 | subforce="-f" |
b9b378a0 | 542 | fi |
31ca3ac3 FF |
543 | |
544 | if test -z "$nofetch" | |
545 | then | |
e5f522d6 JL |
546 | # Run fetch only if $sha1 isn't present or it |
547 | # is not reachable from a ref. | |
74ae1419 | 548 | (clear_local_git_env; cd "$path" && |
f5799e05 | 549 | ( (rev=$(git rev-list -n 1 $sha1 --not --all 2>/dev/null) && |
e5f522d6 | 550 | test -z "$rev") || git-fetch)) || |
497ee872 | 551 | die "$(eval_gettext "Unable to fetch in submodule path '\$path'")" |
31ca3ac3 FF |
552 | fi |
553 | ||
1b4735d9 SO |
554 | # Is this something we just cloned? |
555 | case ";$cloned_modules;" in | |
556 | *";$name;"*) | |
557 | # then there is no local change to integrate | |
558 | update_module= ;; | |
559 | esac | |
560 | ||
877449c1 | 561 | must_die_on_failure= |
32948425 JH |
562 | case "$update_module" in |
563 | rebase) | |
564 | command="git rebase" | |
ee653c89 ÆAB |
565 | die_msg="$(eval_gettext "Unable to rebase '\$sha1' in submodule path '\$path'")" |
566 | say_msg="$(eval_gettext "Submodule path '\$path': rebased into '\$sha1'")" | |
877449c1 | 567 | must_die_on_failure=yes |
32948425 | 568 | ;; |
42b49178 JH |
569 | merge) |
570 | command="git merge" | |
ee653c89 ÆAB |
571 | die_msg="$(eval_gettext "Unable to merge '\$sha1' in submodule path '\$path'")" |
572 | say_msg="$(eval_gettext "Submodule path '\$path': merged in '\$sha1'")" | |
877449c1 | 573 | must_die_on_failure=yes |
42b49178 | 574 | ;; |
32948425 | 575 | *) |
9db31bdf | 576 | command="git checkout $subforce -q" |
ee653c89 ÆAB |
577 | die_msg="$(eval_gettext "Unable to checkout '\$sha1' in submodule path '\$path'")" |
578 | say_msg="$(eval_gettext "Submodule path '\$path': checked out '\$sha1'")" | |
32948425 JH |
579 | ;; |
580 | esac | |
70c7ac22 | 581 | |
15ffb7cd FG |
582 | if (clear_local_git_env; cd "$path" && $command "$sha1") |
583 | then | |
ff968f03 | 584 | say "$say_msg" |
877449c1 JH |
585 | elif test -n "$must_die_on_failure" |
586 | then | |
ff968f03 | 587 | die_with_status 2 "$die_msg" |
15ffb7cd | 588 | else |
ff968f03 | 589 | err="${err};$die_msg" |
877449c1 | 590 | continue |
15ffb7cd | 591 | fi |
70c7ac22 | 592 | fi |
b13fd5c1 JH |
593 | |
594 | if test -n "$recursive" | |
595 | then | |
15ffb7cd FG |
596 | (clear_local_git_env; cd "$path" && eval cmd_update "$orig_flags") |
597 | res=$? | |
598 | if test $res -gt 0 | |
599 | then | |
ff968f03 | 600 | die_msg="$(eval_gettext "Failed to recurse into submodule path '\$path'")" |
15ffb7cd FG |
601 | if test $res -eq 1 |
602 | then | |
ff968f03 | 603 | err="${err};$die_msg" |
15ffb7cd FG |
604 | continue |
605 | else | |
ff968f03 | 606 | die_with_status $res "$die_msg" |
15ffb7cd FG |
607 | fi |
608 | fi | |
b13fd5c1 | 609 | fi |
70c7ac22 | 610 | done |
15ffb7cd FG |
611 | |
612 | if test -n "$err" | |
613 | then | |
614 | OIFS=$IFS | |
615 | IFS=';' | |
616 | for e in $err | |
617 | do | |
618 | if test -n "$e" | |
619 | then | |
620 | echo >&2 "$e" | |
621 | fi | |
622 | done | |
623 | IFS=$OIFS | |
624 | exit 1 | |
625 | fi | |
626 | } | |
70c7ac22 LH |
627 | } |
628 | ||
bffe71f4 EM |
629 | set_name_rev () { |
630 | revname=$( ( | |
74ae1419 | 631 | clear_local_git_env |
bffe71f4 | 632 | cd "$1" && { |
5be60078 JH |
633 | git describe "$2" 2>/dev/null || |
634 | git describe --tags "$2" 2>/dev/null || | |
f669ac0b ML |
635 | git describe --contains "$2" 2>/dev/null || |
636 | git describe --all --always "$2" | |
bffe71f4 EM |
637 | } |
638 | ) ) | |
639 | test -z "$revname" || revname=" ($revname)" | |
640 | } | |
28f9af5d PY |
641 | # |
642 | # Show commit summary for submodules in index or working tree | |
643 | # | |
644 | # If '--cached' is given, show summary between index and given commit, | |
645 | # or between working tree and given commit | |
646 | # | |
647 | # $@ = [commit (default 'HEAD'),] requested paths (default all) | |
648 | # | |
649 | cmd_summary() { | |
f2dc06a3 | 650 | summary_limit=-1 |
d0f64dd4 | 651 | for_status= |
1c244f6e | 652 | diff_cmd=diff-index |
f2dc06a3 | 653 | |
28f9af5d PY |
654 | # parse $args after "submodule ... summary". |
655 | while test $# -ne 0 | |
656 | do | |
657 | case "$1" in | |
658 | --cached) | |
659 | cached="$1" | |
660 | ;; | |
1c244f6e JL |
661 | --files) |
662 | files="$1" | |
663 | ;; | |
d0f64dd4 PY |
664 | --for-status) |
665 | for_status="$1" | |
666 | ;; | |
f2dc06a3 PY |
667 | -n|--summary-limit) |
668 | if summary_limit=$(($2 + 0)) 2>/dev/null && test "$summary_limit" = "$2" | |
669 | then | |
670 | : | |
671 | else | |
672 | usage | |
673 | fi | |
674 | shift | |
675 | ;; | |
28f9af5d PY |
676 | --) |
677 | shift | |
678 | break | |
679 | ;; | |
680 | -*) | |
681 | usage | |
682 | ;; | |
683 | *) | |
684 | break | |
685 | ;; | |
686 | esac | |
687 | shift | |
688 | done | |
bffe71f4 | 689 | |
f2dc06a3 PY |
690 | test $summary_limit = 0 && return |
691 | ||
3deea89c | 692 | if rev=$(git rev-parse -q --verify --default HEAD ${1+"$1"}) |
28f9af5d PY |
693 | then |
694 | head=$rev | |
caa9c3ca | 695 | test $# = 0 || shift |
3deea89c JH |
696 | elif test -z "$1" -o "$1" = "HEAD" |
697 | then | |
14e940d7 JH |
698 | # before the first commit: compare with an empty tree |
699 | head=$(git hash-object -w -t tree --stdin </dev/null) | |
2ea6c2c9 | 700 | test -z "$1" || shift |
28f9af5d | 701 | else |
3deea89c | 702 | head="HEAD" |
28f9af5d PY |
703 | fi |
704 | ||
1c244f6e JL |
705 | if [ -n "$files" ] |
706 | then | |
707 | test -n "$cached" && | |
b9b9c22f | 708 | die "$(gettext -- "--cached cannot be used with --files")" |
1c244f6e JL |
709 | diff_cmd=diff-files |
710 | head= | |
711 | fi | |
712 | ||
28f9af5d PY |
713 | cd_to_toplevel |
714 | # Get modified modules cared by user | |
18076502 | 715 | modules=$(git $diff_cmd $cached --ignore-submodules=dirty --raw $head -- "$@" | |
e1622bfc | 716 | sane_egrep '^:([0-7]* )?160000' | |
28f9af5d PY |
717 | while read mod_src mod_dst sha1_src sha1_dst status name |
718 | do | |
719 | # Always show modules deleted or type-changed (blob<->module) | |
720 | test $status = D -o $status = T && echo "$name" && continue | |
721 | # Also show added or modified modules which are checked out | |
722 | GIT_DIR="$name/.git" git-rev-parse --git-dir >/dev/null 2>&1 && | |
723 | echo "$name" | |
724 | done | |
725 | ) | |
1cb639e6 | 726 | |
d0f64dd4 PY |
727 | test -z "$modules" && return |
728 | ||
18076502 | 729 | git $diff_cmd $cached --ignore-submodules=dirty --raw $head -- $modules | |
e1622bfc | 730 | sane_egrep '^:([0-7]* )?160000' | |
1cb639e6 PY |
731 | cut -c2- | |
732 | while read mod_src mod_dst sha1_src sha1_dst status name | |
733 | do | |
734 | if test -z "$cached" && | |
735 | test $sha1_dst = 0000000000000000000000000000000000000000 | |
736 | then | |
737 | case "$mod_dst" in | |
738 | 160000) | |
739 | sha1_dst=$(GIT_DIR="$name/.git" git rev-parse HEAD) | |
740 | ;; | |
741 | 100644 | 100755 | 120000) | |
742 | sha1_dst=$(git hash-object $name) | |
743 | ;; | |
744 | 000000) | |
745 | ;; # removed | |
746 | *) | |
747 | # unexpected type | |
6ff875c5 | 748 | eval_gettextln "unexpected mode \$mod_dst" >&2 |
1cb639e6 PY |
749 | continue ;; |
750 | esac | |
751 | fi | |
752 | missing_src= | |
753 | missing_dst= | |
754 | ||
755 | test $mod_src = 160000 && | |
30353a40 | 756 | ! GIT_DIR="$name/.git" git-rev-parse -q --verify $sha1_src^0 >/dev/null && |
1cb639e6 PY |
757 | missing_src=t |
758 | ||
759 | test $mod_dst = 160000 && | |
30353a40 | 760 | ! GIT_DIR="$name/.git" git-rev-parse -q --verify $sha1_dst^0 >/dev/null && |
1cb639e6 | 761 | missing_dst=t |
bffe71f4 | 762 | |
1cb639e6 PY |
763 | total_commits= |
764 | case "$missing_src,$missing_dst" in | |
765 | t,) | |
f62f8212 | 766 | errmsg="$(eval_gettext " Warn: \$name doesn't contain commit \$sha1_src")" |
1cb639e6 PY |
767 | ;; |
768 | ,t) | |
f62f8212 | 769 | errmsg="$(eval_gettext " Warn: \$name doesn't contain commit \$sha1_dst")" |
1cb639e6 PY |
770 | ;; |
771 | t,t) | |
f62f8212 | 772 | errmsg="$(eval_gettext " Warn: \$name doesn't contain commits \$sha1_src and \$sha1_dst")" |
1cb639e6 PY |
773 | ;; |
774 | *) | |
775 | errmsg= | |
776 | total_commits=$( | |
777 | if test $mod_src = 160000 -a $mod_dst = 160000 | |
778 | then | |
779 | range="$sha1_src...$sha1_dst" | |
780 | elif test $mod_src = 160000 | |
781 | then | |
782 | range=$sha1_src | |
783 | else | |
784 | range=$sha1_dst | |
785 | fi | |
786 | GIT_DIR="$name/.git" \ | |
b0e621ad | 787 | git rev-list --first-parent $range -- | wc -l |
1cb639e6 | 788 | ) |
eed35595 | 789 | total_commits=" ($(($total_commits + 0)))" |
1cb639e6 PY |
790 | ;; |
791 | esac | |
792 | ||
793 | sha1_abbr_src=$(echo $sha1_src | cut -c1-7) | |
794 | sha1_abbr_dst=$(echo $sha1_dst | cut -c1-7) | |
795 | if test $status = T | |
796 | then | |
b3e73449 ÆAB |
797 | blob="$(gettext "blob")" |
798 | submodule="$(gettext "submodule")" | |
1cb639e6 PY |
799 | if test $mod_dst = 160000 |
800 | then | |
b3e73449 | 801 | echo "* $name $sha1_abbr_src($blob)->$sha1_abbr_dst($submodule)$total_commits:" |
1cb639e6 | 802 | else |
b3e73449 | 803 | echo "* $name $sha1_abbr_src($submodule)->$sha1_abbr_dst($blob)$total_commits:" |
1cb639e6 PY |
804 | fi |
805 | else | |
806 | echo "* $name $sha1_abbr_src...$sha1_abbr_dst$total_commits:" | |
807 | fi | |
808 | if test -n "$errmsg" | |
809 | then | |
810 | # Don't give error msg for modification whose dst is not submodule | |
811 | # i.e. deleted or changed to blob | |
812 | test $mod_dst = 160000 && echo "$errmsg" | |
813 | else | |
814 | if test $mod_src = 160000 -a $mod_dst = 160000 | |
815 | then | |
f2dc06a3 PY |
816 | limit= |
817 | test $summary_limit -gt 0 && limit="-$summary_limit" | |
1cb639e6 | 818 | GIT_DIR="$name/.git" \ |
f2dc06a3 | 819 | git log $limit --pretty='format: %m %s' \ |
1cb639e6 PY |
820 | --first-parent $sha1_src...$sha1_dst |
821 | elif test $mod_dst = 160000 | |
822 | then | |
823 | GIT_DIR="$name/.git" \ | |
824 | git log --pretty='format: > %s' -1 $sha1_dst | |
825 | else | |
826 | GIT_DIR="$name/.git" \ | |
827 | git log --pretty='format: < %s' -1 $sha1_src | |
828 | fi | |
829 | echo | |
830 | fi | |
831 | echo | |
d0f64dd4 PY |
832 | done | |
833 | if test -n "$for_status"; then | |
f17a5d34 | 834 | if [ -n "$files" ]; then |
6ff875c5 | 835 | gettextln "# Submodules changed but not updated:" |
f17a5d34 | 836 | else |
6ff875c5 | 837 | gettextln "# Submodule changes to be committed:" |
f17a5d34 | 838 | fi |
d0f64dd4 PY |
839 | echo "#" |
840 | sed -e 's|^|# |' -e 's|^# $|#|' | |
841 | else | |
842 | cat | |
843 | fi | |
28f9af5d | 844 | } |
70c7ac22 | 845 | # |
941987a5 | 846 | # List all submodules, prefixed with: |
70c7ac22 LH |
847 | # - submodule not initialized |
848 | # + different revision checked out | |
849 | # | |
850 | # If --cached was specified the revision in the index will be printed | |
851 | # instead of the currently checked out revision. | |
852 | # | |
853 | # $@ = requested paths (default to all) | |
854 | # | |
23a485e3 | 855 | cmd_status() |
70c7ac22 | 856 | { |
5c08dbbd | 857 | # parse $args after "submodule ... status". |
98dbe63d | 858 | orig_flags= |
5c08dbbd JH |
859 | while test $# -ne 0 |
860 | do | |
861 | case "$1" in | |
862 | -q|--quiet) | |
2e6a30ef | 863 | GIT_QUIET=1 |
5c08dbbd JH |
864 | ;; |
865 | --cached) | |
866 | cached=1 | |
867 | ;; | |
64b19ffe JH |
868 | --recursive) |
869 | recursive=1 | |
870 | ;; | |
5c08dbbd JH |
871 | --) |
872 | shift | |
873 | break | |
874 | ;; | |
875 | -*) | |
876 | usage | |
877 | ;; | |
878 | *) | |
879 | break | |
880 | ;; | |
881 | esac | |
98dbe63d | 882 | orig_flags="$orig_flags $(git rev-parse --sq-quote "$1")" |
5c08dbbd JH |
883 | shift |
884 | done | |
885 | ||
a7b3269c | 886 | module_list "$@" | |
70c7ac22 LH |
887 | while read mode sha1 stage path |
888 | do | |
941987a5 | 889 | name=$(module_name "$path") || exit |
5be60078 | 890 | url=$(git config submodule."$name".url) |
64b19ffe | 891 | displaypath="$prefix$path" |
313ee0d6 NMC |
892 | if test "$stage" = U |
893 | then | |
894 | say "U$sha1 $displaypath" | |
895 | continue | |
896 | fi | |
ba88a1fe | 897 | if test -z "$url" || ! test -d "$path"/.git -o -f "$path"/.git |
70c7ac22 | 898 | then |
64b19ffe | 899 | say "-$sha1 $displaypath" |
70c7ac22 LH |
900 | continue; |
901 | fi | |
41c7c1bd | 902 | set_name_rev "$path" "$sha1" |
18076502 | 903 | if git diff-files --ignore-submodules=dirty --quiet -- "$path" |
70c7ac22 | 904 | then |
64b19ffe | 905 | say " $sha1 $displaypath$revname" |
70c7ac22 LH |
906 | else |
907 | if test -z "$cached" | |
908 | then | |
74ae1419 | 909 | sha1=$(clear_local_git_env; cd "$path" && git rev-parse --verify HEAD) |
41c7c1bd | 910 | set_name_rev "$path" "$sha1" |
70c7ac22 | 911 | fi |
64b19ffe JH |
912 | say "+$sha1 $displaypath$revname" |
913 | fi | |
914 | ||
915 | if test -n "$recursive" | |
916 | then | |
917 | ( | |
918 | prefix="$displaypath/" | |
74ae1419 | 919 | clear_local_git_env |
64b19ffe | 920 | cd "$path" && |
a7eff1a8 | 921 | eval cmd_status "$orig_args" |
64b19ffe | 922 | ) || |
497ee872 | 923 | die "$(eval_gettext "Failed to recurse into submodule path '\$path'")" |
70c7ac22 LH |
924 | fi |
925 | done | |
926 | } | |
2327f61e DA |
927 | # |
928 | # Sync remote urls for submodules | |
929 | # This makes the value for remote.$remote.url match the value | |
930 | # specified in .gitmodules. | |
931 | # | |
932 | cmd_sync() | |
933 | { | |
934 | while test $# -ne 0 | |
935 | do | |
936 | case "$1" in | |
937 | -q|--quiet) | |
2e6a30ef | 938 | GIT_QUIET=1 |
2327f61e DA |
939 | shift |
940 | ;; | |
941 | --) | |
942 | shift | |
943 | break | |
944 | ;; | |
945 | -*) | |
946 | usage | |
947 | ;; | |
948 | *) | |
949 | break | |
950 | ;; | |
951 | esac | |
952 | done | |
953 | cd_to_toplevel | |
954 | module_list "$@" | | |
955 | while read mode sha1 stage path | |
956 | do | |
957 | name=$(module_name "$path") | |
958 | url=$(git config -f .gitmodules --get submodule."$name".url) | |
baede9f8 JH |
959 | |
960 | # Possibly a url relative to parent | |
961 | case "$url" in | |
962 | ./*|../*) | |
963 | url=$(resolve_relative_url "$url") || exit | |
964 | ;; | |
965 | esac | |
966 | ||
ccee6086 | 967 | if git config "submodule.$name.url" >/dev/null 2>/dev/null |
2327f61e | 968 | then |
0591c0a5 | 969 | say "$(eval_gettext "Synchronizing submodule url for '\$name'")" |
ccee6086 JH |
970 | git config submodule."$name".url "$url" |
971 | ||
972 | if test -e "$path"/.git | |
973 | then | |
974 | ( | |
975 | clear_local_git_env | |
976 | cd "$path" | |
977 | remote=$(get_default_remote) | |
978 | git config remote."$remote".url "$url" | |
979 | ) | |
980 | fi | |
2327f61e DA |
981 | fi |
982 | done | |
983 | } | |
70c7ac22 | 984 | |
5c08dbbd JH |
985 | # This loop parses the command line arguments to find the |
986 | # subcommand name to dispatch. Parsing of the subcommand specific | |
987 | # options are primarily done by the subcommand implementations. | |
988 | # Subcommand specific options such as --branch and --cached are | |
989 | # parsed here as well, for backward compatibility. | |
990 | ||
991 | while test $# != 0 && test -z "$command" | |
70c7ac22 LH |
992 | do |
993 | case "$1" in | |
2327f61e | 994 | add | foreach | init | update | status | summary | sync) |
5c08dbbd | 995 | command=$1 |
70c7ac22 LH |
996 | ;; |
997 | -q|--quiet) | |
2e6a30ef | 998 | GIT_QUIET=1 |
70c7ac22 | 999 | ;; |
ecda0723 SV |
1000 | -b|--branch) |
1001 | case "$2" in | |
1002 | '') | |
1003 | usage | |
1004 | ;; | |
1005 | esac | |
1006 | branch="$2"; shift | |
1007 | ;; | |
70c7ac22 | 1008 | --cached) |
28f9af5d | 1009 | cached="$1" |
70c7ac22 LH |
1010 | ;; |
1011 | --) | |
1012 | break | |
1013 | ;; | |
1014 | -*) | |
1015 | usage | |
1016 | ;; | |
1017 | *) | |
1018 | break | |
1019 | ;; | |
1020 | esac | |
1021 | shift | |
1022 | done | |
1023 | ||
5c08dbbd JH |
1024 | # No command word defaults to "status" |
1025 | test -n "$command" || command=status | |
1026 | ||
1027 | # "-b branch" is accepted only by "add" | |
1028 | if test -n "$branch" && test "$command" != add | |
1029 | then | |
ecda0723 | 1030 | usage |
5c08dbbd JH |
1031 | fi |
1032 | ||
28f9af5d PY |
1033 | # "--cached" is accepted only by "status" and "summary" |
1034 | if test -n "$cached" && test "$command" != status -a "$command" != summary | |
5c08dbbd | 1035 | then |
70c7ac22 | 1036 | usage |
5c08dbbd JH |
1037 | fi |
1038 | ||
1039 | "cmd_$command" "$@" |