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