Lars Hjemli | 70c7ac2 | 2007-05-26 15:56:40 +0200 | [diff] [blame] | 1 | #!/bin/sh |
| 2 | # |
Michał Górny | 4c8a9db | 2012-06-25 12:56:59 +0200 | [diff] [blame] | 3 | # git-submodule.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/-/ /') |
Junio C Hamano | 681b036 | 2012-11-21 13:25:42 -0800 | [diff] [blame] | 8 | USAGE="[--quiet] add [-b <branch>] [-f|--force] [--name <name>] [--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>...] |
Jens Lehmann | cf41982 | 2013-03-04 22:20:24 +0100 | [diff] [blame] | 11 | or: $dashless [--quiet] deinit [-f|--force] [--] <path>... |
Jens Lehmann | 893a976 | 2014-02-28 22:41:11 +0000 | [diff] [blame] | 12 | or: $dashless [--quiet] update [--init] [--remote] [-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--reference <repository>] [--recursive] [--] [<path>...] |
Junio C Hamano | adc5423 | 2009-08-27 16:59:25 -0700 | [diff] [blame] | 13 | or: $dashless [--quiet] summary [--cached|--files] [--summary-limit <n>] [commit] [--] [<path>...] |
Johan Herland | 15fc56a | 2009-08-19 03:45:22 +0200 | [diff] [blame] | 14 | or: $dashless [--quiet] foreach [--recursive] <command> |
Phil Hord | 82f49f2 | 2012-10-26 15:44:42 -0400 | [diff] [blame] | 15 | or: $dashless [--quiet] sync [--recursive] [--] [<path>...]" |
Junio C Hamano | 8f321a3 | 2007-11-06 01:50:02 -0800 | [diff] [blame] | 16 | OPTIONS_SPEC= |
John Keeping | 091a6eb | 2013-06-16 15:18:18 +0100 | [diff] [blame] | 17 | SUBDIRECTORY_OK=Yes |
Lars Hjemli | 70c7ac2 | 2007-05-26 15:56:40 +0200 | [diff] [blame] | 18 | . git-sh-setup |
Ævar Arnfjörð Bjarmason | d0ad825 | 2011-05-21 18:43:58 +0000 | [diff] [blame] | 19 | . git-sh-i18n |
Mark Levedahl | 98fcf84 | 2008-08-24 14:46:10 -0400 | [diff] [blame] | 20 | . git-parse-remote |
Lars Hjemli | 70c7ac2 | 2007-05-26 15:56:40 +0200 | [diff] [blame] | 21 | require_work_tree |
John Keeping | 091a6eb | 2013-06-16 15:18:18 +0100 | [diff] [blame] | 22 | wt_prefix=$(git rev-parse --show-prefix) |
| 23 | cd_to_toplevel |
Lars Hjemli | 70c7ac2 | 2007-05-26 15:56:40 +0200 | [diff] [blame] | 24 | |
Junio C Hamano | 5c08dbb | 2008-01-15 02:48:45 -0800 | [diff] [blame] | 25 | command= |
Sven Verdoolaege | ecda072 | 2007-06-24 23:06:07 +0200 | [diff] [blame] | 26 | branch= |
Jens Lehmann | d27b876 | 2010-07-17 17:11:43 +0200 | [diff] [blame] | 27 | force= |
Michael S. Tsirkin | d92a395 | 2009-05-04 22:30:01 +0300 | [diff] [blame] | 28 | reference= |
Lars Hjemli | 70c7ac2 | 2007-05-26 15:56:40 +0200 | [diff] [blame] | 29 | cached= |
Gerrit Pape | 48bb303 | 2010-04-26 11:50:39 +0200 | [diff] [blame] | 30 | recursive= |
| 31 | init= |
Jens Lehmann | 1c244f6 | 2009-08-13 21:32:50 +0200 | [diff] [blame] | 32 | files= |
W. Trevor King | 06b1abb | 2012-12-19 11:03:32 -0500 | [diff] [blame] | 33 | remote= |
Fabian Franz | 31ca3ac | 2009-02-05 20:18:32 -0200 | [diff] [blame] | 34 | nofetch= |
Johan Herland | 3294842 | 2009-06-03 08:27:06 +0200 | [diff] [blame] | 35 | update= |
Johan Herland | 15fc56a | 2009-08-19 03:45:22 +0200 | [diff] [blame] | 36 | prefix= |
Jens Lehmann | 73b0898 | 2012-09-30 01:05:58 +0200 | [diff] [blame] | 37 | custom_name= |
Fredrik Gustafsson | 275cd18 | 2013-07-02 23:42:56 +0200 | [diff] [blame] | 38 | depth= |
Lars Hjemli | 70c7ac2 | 2007-05-26 15:56:40 +0200 | [diff] [blame] | 39 | |
Jon Seymour | 967b2c6 | 2012-06-06 21:57:29 +1000 | [diff] [blame] | 40 | # The function takes at most 2 arguments. The first argument is the |
| 41 | # URL that navigates to the submodule origin repo. When relative, this URL |
| 42 | # is relative to the superproject origin URL repo. The second up_path |
| 43 | # argument, if specified, is the relative path that navigates |
| 44 | # from the submodule working tree to the superproject working tree. |
| 45 | # |
| 46 | # The output of the function is the origin URL of the submodule. |
| 47 | # |
| 48 | # The output will either be an absolute URL or filesystem path (if the |
| 49 | # superproject origin URL is an absolute URL or filesystem path, |
| 50 | # respectively) or a relative file system path (if the superproject |
| 51 | # origin URL is a relative file system path). |
| 52 | # |
| 53 | # When the output is a relative file system path, the path is either |
| 54 | # relative to the submodule working tree, if up_path is specified, or to |
| 55 | # the superproject working tree otherwise. |
Mark Levedahl | f31a522 | 2007-09-23 22:19:42 -0400 | [diff] [blame] | 56 | resolve_relative_url () |
| 57 | { |
Mark Levedahl | 98fcf84 | 2008-08-24 14:46:10 -0400 | [diff] [blame] | 58 | remote=$(get_default_remote) |
Mark Levedahl | 8e7e6f3 | 2008-06-14 13:09:41 -0400 | [diff] [blame] | 59 | remoteurl=$(git config "remote.$remote.url") || |
Jens Lehmann | 4d68932 | 2011-06-06 21:58:04 +0200 | [diff] [blame] | 60 | remoteurl=$(pwd) # the repository is its own authoritative upstream |
Mark Levedahl | f31a522 | 2007-09-23 22:19:42 -0400 | [diff] [blame] | 61 | url="$1" |
Mark Levedahl | 99b120a | 2008-08-21 19:54:01 -0400 | [diff] [blame] | 62 | remoteurl=${remoteurl%/} |
Thomas Rast | ea640cc | 2011-01-10 11:37:26 +0100 | [diff] [blame] | 63 | sep=/ |
Jon Seymour | 967b2c6 | 2012-06-06 21:57:29 +1000 | [diff] [blame] | 64 | up_path="$2" |
| 65 | |
| 66 | case "$remoteurl" in |
| 67 | *:*|/*) |
| 68 | is_relative= |
| 69 | ;; |
Jon Seymour | 758615e | 2012-06-06 21:57:30 +1000 | [diff] [blame] | 70 | ./*|../*) |
| 71 | is_relative=t |
| 72 | ;; |
Jon Seymour | 967b2c6 | 2012-06-06 21:57:29 +1000 | [diff] [blame] | 73 | *) |
| 74 | is_relative=t |
Jon Seymour | 758615e | 2012-06-06 21:57:30 +1000 | [diff] [blame] | 75 | remoteurl="./$remoteurl" |
Jon Seymour | 967b2c6 | 2012-06-06 21:57:29 +1000 | [diff] [blame] | 76 | ;; |
| 77 | esac |
| 78 | |
Mark Levedahl | f31a522 | 2007-09-23 22:19:42 -0400 | [diff] [blame] | 79 | while test -n "$url" |
| 80 | do |
| 81 | case "$url" in |
| 82 | ../*) |
| 83 | url="${url#../}" |
Thomas Rast | ea640cc | 2011-01-10 11:37:26 +0100 | [diff] [blame] | 84 | case "$remoteurl" in |
| 85 | */*) |
| 86 | remoteurl="${remoteurl%/*}" |
| 87 | ;; |
| 88 | *:*) |
| 89 | remoteurl="${remoteurl%:*}" |
| 90 | sep=: |
| 91 | ;; |
| 92 | *) |
Jon Seymour | 758615e | 2012-06-06 21:57:30 +1000 | [diff] [blame] | 93 | if test -z "$is_relative" || test "." = "$remoteurl" |
| 94 | then |
| 95 | die "$(eval_gettext "cannot strip one component off url '\$remoteurl'")" |
| 96 | else |
| 97 | remoteurl=. |
| 98 | fi |
Thomas Rast | ea640cc | 2011-01-10 11:37:26 +0100 | [diff] [blame] | 99 | ;; |
| 100 | esac |
Mark Levedahl | f31a522 | 2007-09-23 22:19:42 -0400 | [diff] [blame] | 101 | ;; |
| 102 | ./*) |
| 103 | url="${url#./}" |
| 104 | ;; |
| 105 | *) |
| 106 | break;; |
| 107 | esac |
| 108 | done |
Jon Seymour | 758615e | 2012-06-06 21:57:30 +1000 | [diff] [blame] | 109 | remoteurl="$remoteurl$sep${url%/}" |
| 110 | echo "${is_relative:+${up_path}}${remoteurl#./}" |
Mark Levedahl | f31a522 | 2007-09-23 22:19:42 -0400 | [diff] [blame] | 111 | } |
| 112 | |
John Keeping | 091a6eb | 2013-06-16 15:18:18 +0100 | [diff] [blame] | 113 | # Resolve a path to be relative to another path. This is intended for |
| 114 | # converting submodule paths when git-submodule is run in a subdirectory |
| 115 | # and only handles paths where the directory separator is '/'. |
| 116 | # |
| 117 | # The output is the first argument as a path relative to the second argument, |
| 118 | # which defaults to $wt_prefix if it is omitted. |
| 119 | relative_path () |
| 120 | { |
| 121 | local target curdir result |
| 122 | target=$1 |
| 123 | curdir=${2-$wt_prefix} |
| 124 | curdir=${curdir%/} |
| 125 | result= |
| 126 | |
| 127 | while test -n "$curdir" |
| 128 | do |
| 129 | case "$target" in |
| 130 | "$curdir/"*) |
| 131 | target=${target#"$curdir"/} |
| 132 | break |
| 133 | ;; |
| 134 | esac |
| 135 | |
| 136 | result="${result}../" |
| 137 | if test "$curdir" = "${curdir%/*}" |
| 138 | then |
| 139 | curdir= |
| 140 | else |
| 141 | curdir="${curdir%/*}" |
| 142 | fi |
| 143 | done |
| 144 | |
| 145 | echo "$result$target" |
| 146 | } |
| 147 | |
Lars Hjemli | 941987a | 2007-06-11 21:12:24 +0200 | [diff] [blame] | 148 | # |
David Aguilar | a7b3269 | 2008-08-22 00:30:50 -0700 | [diff] [blame] | 149 | # Get submodule info for registered submodules |
| 150 | # $@ = path to limit submodule list |
| 151 | # |
| 152 | module_list() |
| 153 | { |
John Keeping | 091a6eb | 2013-06-16 15:18:18 +0100 | [diff] [blame] | 154 | eval "set $(git rev-parse --sq --prefix "$wt_prefix" -- "$@")" |
Heiko Voigt | be9d0a3 | 2012-08-14 22:35:27 +0200 | [diff] [blame] | 155 | ( |
Fredrik Gustafsson | 7467124 | 2013-06-14 02:26:02 +0200 | [diff] [blame] | 156 | git ls-files -z --error-unmatch --stage -- "$@" || |
Heiko Voigt | be9d0a3 | 2012-08-14 22:35:27 +0200 | [diff] [blame] | 157 | echo "unmatched pathspec exists" |
| 158 | ) | |
Jeff King | fcb06a8 | 2013-10-28 21:19:59 -0400 | [diff] [blame] | 159 | @@PERL@@ -e ' |
Nicolas Morey-Chaisemartin | 313ee0d | 2011-03-30 07:20:02 +0200 | [diff] [blame] | 160 | my %unmerged = (); |
| 161 | my ($null_sha1) = ("0" x 40); |
Heiko Voigt | be9d0a3 | 2012-08-14 22:35:27 +0200 | [diff] [blame] | 162 | my @out = (); |
| 163 | my $unmatched = 0; |
Fredrik Gustafsson | 7467124 | 2013-06-14 02:26:02 +0200 | [diff] [blame] | 164 | $/ = "\0"; |
Nicolas Morey-Chaisemartin | 313ee0d | 2011-03-30 07:20:02 +0200 | [diff] [blame] | 165 | while (<STDIN>) { |
Heiko Voigt | be9d0a3 | 2012-08-14 22:35:27 +0200 | [diff] [blame] | 166 | if (/^unmatched pathspec/) { |
| 167 | $unmatched = 1; |
| 168 | next; |
| 169 | } |
Nicolas Morey-Chaisemartin | 313ee0d | 2011-03-30 07:20:02 +0200 | [diff] [blame] | 170 | chomp; |
| 171 | my ($mode, $sha1, $stage, $path) = |
| 172 | /^([0-7]+) ([0-9a-f]{40}) ([0-3])\t(.*)$/; |
| 173 | next unless $mode eq "160000"; |
| 174 | if ($stage ne "0") { |
| 175 | if (!$unmerged{$path}++) { |
Heiko Voigt | be9d0a3 | 2012-08-14 22:35:27 +0200 | [diff] [blame] | 176 | push @out, "$mode $null_sha1 U\t$path\n"; |
Nicolas Morey-Chaisemartin | 313ee0d | 2011-03-30 07:20:02 +0200 | [diff] [blame] | 177 | } |
| 178 | next; |
| 179 | } |
Heiko Voigt | be9d0a3 | 2012-08-14 22:35:27 +0200 | [diff] [blame] | 180 | push @out, "$_\n"; |
| 181 | } |
| 182 | if ($unmatched) { |
| 183 | print "#unmatched\n"; |
| 184 | } else { |
| 185 | print for (@out); |
Nicolas Morey-Chaisemartin | 313ee0d | 2011-03-30 07:20:02 +0200 | [diff] [blame] | 186 | } |
| 187 | ' |
David Aguilar | a7b3269 | 2008-08-22 00:30:50 -0700 | [diff] [blame] | 188 | } |
| 189 | |
Heiko Voigt | be9d0a3 | 2012-08-14 22:35:27 +0200 | [diff] [blame] | 190 | die_if_unmatched () |
| 191 | { |
| 192 | if test "$1" = "#unmatched" |
| 193 | then |
| 194 | exit 1 |
| 195 | fi |
| 196 | } |
| 197 | |
David Aguilar | a7b3269 | 2008-08-22 00:30:50 -0700 | [diff] [blame] | 198 | # |
W. Trevor King | 88ce00c | 2012-12-11 13:58:15 -0500 | [diff] [blame] | 199 | # Print a submodule configuration setting |
| 200 | # |
| 201 | # $1 = submodule name |
| 202 | # $2 = option name |
| 203 | # $3 = default value |
| 204 | # |
| 205 | # Checks in the usual git-config places first (for overrides), |
| 206 | # otherwise it falls back on .gitmodules. This allows you to |
| 207 | # distribute project-wide defaults in .gitmodules, while still |
| 208 | # customizing individual repositories if necessary. If the option is |
| 209 | # not in .gitmodules either, print a default value. |
| 210 | # |
| 211 | get_submodule_config () { |
| 212 | name="$1" |
| 213 | option="$2" |
| 214 | default="$3" |
| 215 | value=$(git config submodule."$name"."$option") |
| 216 | if test -z "$value" |
| 217 | then |
| 218 | value=$(git config -f .gitmodules submodule."$name"."$option") |
| 219 | fi |
| 220 | printf '%s' "${value:-$default}" |
| 221 | } |
| 222 | |
| 223 | |
| 224 | # |
Lars Hjemli | 941987a | 2007-06-11 21:12:24 +0200 | [diff] [blame] | 225 | # Map submodule path to submodule name |
| 226 | # |
| 227 | # $1 = path |
| 228 | # |
| 229 | module_name() |
| 230 | { |
Junio C Hamano | 537601a | 2007-07-25 15:51:26 -0700 | [diff] [blame] | 231 | # Do we have "submodule.<something>.path = $1" defined in .gitmodules file? |
Ramsay Jones | 64394e3 | 2012-04-17 19:00:58 +0100 | [diff] [blame] | 232 | sm_path="$1" |
Chris Ridd | fe22e54 | 2008-06-11 14:09:19 +0100 | [diff] [blame] | 233 | re=$(printf '%s\n' "$1" | sed -e 's/[].[^$\\*]/\\&/g') |
Imran M Yousuf | a5099bb | 2008-05-15 13:42:58 +0600 | [diff] [blame] | 234 | name=$( git config -f .gitmodules --get-regexp '^submodule\..*\.path$' | |
Junio C Hamano | 537601a | 2007-07-25 15:51:26 -0700 | [diff] [blame] | 235 | sed -n -e 's|^submodule\.\(.*\)\.path '"$re"'$|\1|p' ) |
Tay Ray Chuan | 1e42258 | 2011-10-21 21:49:35 +0800 | [diff] [blame] | 236 | test -z "$name" && |
Ramsay Jones | 64394e3 | 2012-04-17 19:00:58 +0100 | [diff] [blame] | 237 | die "$(eval_gettext "No submodule mapping found in .gitmodules for path '\$sm_path'")" |
Junio C Hamano | 6a06623 | 2014-06-10 08:33:39 -0700 | [diff] [blame] | 238 | printf '%s\n' "$name" |
Lars Hjemli | 941987a | 2007-06-11 21:12:24 +0200 | [diff] [blame] | 239 | } |
Lars Hjemli | 33aa6ff | 2007-06-06 11:13:01 +0200 | [diff] [blame] | 240 | |
| 241 | # |
| 242 | # Clone a submodule |
| 243 | # |
W. Trevor King | 9adfc1c | 2014-01-15 20:10:23 -0800 | [diff] [blame] | 244 | # $1 = submodule path |
| 245 | # $2 = submodule name |
| 246 | # $3 = URL to clone |
| 247 | # $4 = reference repository to reuse (empty for independent) |
| 248 | # $5 = depth argument for shallow clones (empty for deep) |
| 249 | # |
Junio C Hamano | 23a485e | 2008-01-15 02:35:49 -0800 | [diff] [blame] | 250 | # Prior to calling, cmd_update checks that a possibly existing |
Sven Verdoolaege | ecda072 | 2007-06-24 23:06:07 +0200 | [diff] [blame] | 251 | # path is not a git repository. |
Junio C Hamano | 23a485e | 2008-01-15 02:35:49 -0800 | [diff] [blame] | 252 | # Likewise, cmd_add checks that path does not exist at all, |
Sven Verdoolaege | ecda072 | 2007-06-24 23:06:07 +0200 | [diff] [blame] | 253 | # since it is the location of a new submodule. |
| 254 | # |
Lars Hjemli | 33aa6ff | 2007-06-06 11:13:01 +0200 | [diff] [blame] | 255 | module_clone() |
| 256 | { |
Ramsay Jones | 64394e3 | 2012-04-17 19:00:58 +0100 | [diff] [blame] | 257 | sm_path=$1 |
Jens Lehmann | 73b0898 | 2012-09-30 01:05:58 +0200 | [diff] [blame] | 258 | name=$2 |
| 259 | url=$3 |
| 260 | reference="$4" |
Fredrik Gustafsson | 275cd18 | 2013-07-02 23:42:56 +0200 | [diff] [blame] | 261 | depth="$5" |
Jens Lehmann | 7e60407 | 2011-07-26 23:39:03 +0200 | [diff] [blame] | 262 | quiet= |
| 263 | if test -n "$GIT_QUIET" |
| 264 | then |
| 265 | quiet=-q |
| 266 | fi |
Lars Hjemli | 33aa6ff | 2007-06-06 11:13:01 +0200 | [diff] [blame] | 267 | |
Fredrik Gustafsson | 501770e | 2011-08-15 23:17:47 +0200 | [diff] [blame] | 268 | gitdir= |
| 269 | gitdir_base= |
Jens Lehmann | 69c3051 | 2012-03-04 22:15:36 +0100 | [diff] [blame] | 270 | base_name=$(dirname "$name") |
Lars Hjemli | 33aa6ff | 2007-06-06 11:13:01 +0200 | [diff] [blame] | 271 | |
Fredrik Gustafsson | 501770e | 2011-08-15 23:17:47 +0200 | [diff] [blame] | 272 | gitdir=$(git rev-parse --git-dir) |
Jens Lehmann | 69c3051 | 2012-03-04 22:15:36 +0100 | [diff] [blame] | 273 | gitdir_base="$gitdir/modules/$base_name" |
| 274 | gitdir="$gitdir/modules/$name" |
Fredrik Gustafsson | 501770e | 2011-08-15 23:17:47 +0200 | [diff] [blame] | 275 | |
| 276 | if test -d "$gitdir" |
Michael S. Tsirkin | d92a395 | 2009-05-04 22:30:01 +0300 | [diff] [blame] | 277 | then |
Ramsay Jones | 64394e3 | 2012-04-17 19:00:58 +0100 | [diff] [blame] | 278 | mkdir -p "$sm_path" |
Fredrik Gustafsson | 501770e | 2011-08-15 23:17:47 +0200 | [diff] [blame] | 279 | rm -f "$gitdir/index" |
Michael S. Tsirkin | d92a395 | 2009-05-04 22:30:01 +0300 | [diff] [blame] | 280 | else |
Fredrik Gustafsson | 501770e | 2011-08-15 23:17:47 +0200 | [diff] [blame] | 281 | mkdir -p "$gitdir_base" |
Daniel Graña | be8779f | 2012-07-22 11:49:44 -0300 | [diff] [blame] | 282 | ( |
| 283 | clear_local_git_env |
Fredrik Gustafsson | 275cd18 | 2013-07-02 23:42:56 +0200 | [diff] [blame] | 284 | git clone $quiet ${depth:+"$depth"} -n ${reference:+"$reference"} \ |
Daniel Graña | be8779f | 2012-07-22 11:49:44 -0300 | [diff] [blame] | 285 | --separate-git-dir "$gitdir" "$url" "$sm_path" |
| 286 | ) || |
Ramsay Jones | 64394e3 | 2012-04-17 19:00:58 +0100 | [diff] [blame] | 287 | die "$(eval_gettext "Clone of '\$url' into submodule path '\$sm_path' failed")" |
Fredrik Gustafsson | 501770e | 2011-08-15 23:17:47 +0200 | [diff] [blame] | 288 | fi |
Jens Lehmann | ea115a0 | 2012-03-04 22:14:30 +0100 | [diff] [blame] | 289 | |
Jens Lehmann | 6eafa6d | 2012-07-12 19:45:32 +0200 | [diff] [blame] | 290 | # We already are at the root of the work tree but cd_to_toplevel will |
| 291 | # resolve any symlinks that might be present in $PWD |
| 292 | a=$(cd_to_toplevel && cd "$gitdir" && pwd)/ |
Junio C Hamano | 15b3c82 | 2012-07-22 12:55:47 -0700 | [diff] [blame] | 293 | b=$(cd_to_toplevel && cd "$sm_path" && pwd)/ |
Jens Lehmann | d75219b | 2012-03-04 22:15:08 +0100 | [diff] [blame] | 294 | # Remove all common leading directories after a sanity check |
| 295 | if test "${a#$b}" != "$a" || test "${b#$a}" != "$b"; then |
| 296 | die "$(eval_gettext "Gitdir '\$a' is part of the submodule path '\$b' or vice versa")" |
| 297 | fi |
| 298 | while test "${a%%/*}" = "${b%%/*}" |
| 299 | do |
| 300 | a=${a#*/} |
| 301 | b=${b#*/} |
| 302 | done |
| 303 | # Now chop off the trailing '/'s that were added in the beginning |
| 304 | a=${a%/} |
| 305 | b=${b%/} |
| 306 | |
Ben Walton | c5bc42b | 2012-04-09 16:08:02 -0400 | [diff] [blame] | 307 | # Turn each leading "*/" component into "../" |
Junio C Hamano | 6a06623 | 2014-06-10 08:33:39 -0700 | [diff] [blame] | 308 | rel=$(printf '%s\n' "$b" | sed -e 's|[^/][^/]*|..|g') |
| 309 | printf '%s\n' "gitdir: $rel/$a" >"$sm_path/.git" |
Jens Lehmann | 69c3051 | 2012-03-04 22:15:36 +0100 | [diff] [blame] | 310 | |
Junio C Hamano | 6a06623 | 2014-06-10 08:33:39 -0700 | [diff] [blame] | 311 | rel=$(printf '%s\n' "$a" | sed -e 's|[^/][^/]*|..|g') |
Junio C Hamano | d851ffb | 2014-04-02 14:15:36 -0700 | [diff] [blame] | 312 | (clear_local_git_env; cd "$sm_path" && GIT_WORK_TREE=. git config core.worktree "$rel/$b") |
Lars Hjemli | 33aa6ff | 2007-06-06 11:13:01 +0200 | [diff] [blame] | 313 | } |
| 314 | |
René Scharfe | 862ae6c | 2013-04-01 15:06:27 +0200 | [diff] [blame] | 315 | isnumber() |
| 316 | { |
| 317 | n=$(($1 + 0)) 2>/dev/null && test "$n" = "$1" |
| 318 | } |
| 319 | |
Lars Hjemli | 70c7ac2 | 2007-05-26 15:56:40 +0200 | [diff] [blame] | 320 | # |
Sven Verdoolaege | ecda072 | 2007-06-24 23:06:07 +0200 | [diff] [blame] | 321 | # Add a new submodule to the working tree, .gitmodules and the index |
| 322 | # |
Mark Levedahl | ec05df3 | 2008-07-09 21:05:40 -0400 | [diff] [blame] | 323 | # $@ = repo path |
Sven Verdoolaege | ecda072 | 2007-06-24 23:06:07 +0200 | [diff] [blame] | 324 | # |
| 325 | # optional branch is stored in global branch variable |
| 326 | # |
Junio C Hamano | 23a485e | 2008-01-15 02:35:49 -0800 | [diff] [blame] | 327 | cmd_add() |
Sven Verdoolaege | ecda072 | 2007-06-24 23:06:07 +0200 | [diff] [blame] | 328 | { |
Junio C Hamano | 5c08dbb | 2008-01-15 02:48:45 -0800 | [diff] [blame] | 329 | # parse $args after "submodule ... add". |
John Keeping | 091a6eb | 2013-06-16 15:18:18 +0100 | [diff] [blame] | 330 | reference_path= |
Junio C Hamano | 5c08dbb | 2008-01-15 02:48:45 -0800 | [diff] [blame] | 331 | while test $# -ne 0 |
| 332 | do |
| 333 | case "$1" in |
| 334 | -b | --branch) |
| 335 | case "$2" in '') usage ;; esac |
| 336 | branch=$2 |
| 337 | shift |
| 338 | ;; |
Jens Lehmann | d27b876 | 2010-07-17 17:11:43 +0200 | [diff] [blame] | 339 | -f | --force) |
| 340 | force=$1 |
| 341 | ;; |
Junio C Hamano | 5c08dbb | 2008-01-15 02:48:45 -0800 | [diff] [blame] | 342 | -q|--quiet) |
Stephen Boyd | 2e6a30e | 2009-06-16 15:33:00 -0700 | [diff] [blame] | 343 | GIT_QUIET=1 |
Junio C Hamano | 5c08dbb | 2008-01-15 02:48:45 -0800 | [diff] [blame] | 344 | ;; |
Michael S. Tsirkin | d92a395 | 2009-05-04 22:30:01 +0300 | [diff] [blame] | 345 | --reference) |
| 346 | case "$2" in '') usage ;; esac |
John Keeping | 091a6eb | 2013-06-16 15:18:18 +0100 | [diff] [blame] | 347 | reference_path=$2 |
Michael S. Tsirkin | d92a395 | 2009-05-04 22:30:01 +0300 | [diff] [blame] | 348 | shift |
| 349 | ;; |
| 350 | --reference=*) |
John Keeping | 091a6eb | 2013-06-16 15:18:18 +0100 | [diff] [blame] | 351 | reference_path="${1#--reference=}" |
Michael S. Tsirkin | d92a395 | 2009-05-04 22:30:01 +0300 | [diff] [blame] | 352 | ;; |
Jens Lehmann | 73b0898 | 2012-09-30 01:05:58 +0200 | [diff] [blame] | 353 | --name) |
| 354 | case "$2" in '') usage ;; esac |
| 355 | custom_name=$2 |
| 356 | shift |
| 357 | ;; |
Fredrik Gustafsson | 275cd18 | 2013-07-02 23:42:56 +0200 | [diff] [blame] | 358 | --depth) |
| 359 | case "$2" in '') usage ;; esac |
| 360 | depth="--depth=$2" |
| 361 | shift |
| 362 | ;; |
| 363 | --depth=*) |
| 364 | depth=$1 |
| 365 | ;; |
Junio C Hamano | 5c08dbb | 2008-01-15 02:48:45 -0800 | [diff] [blame] | 366 | --) |
| 367 | shift |
| 368 | break |
| 369 | ;; |
| 370 | -*) |
| 371 | usage |
| 372 | ;; |
| 373 | *) |
| 374 | break |
| 375 | ;; |
| 376 | esac |
| 377 | shift |
| 378 | done |
| 379 | |
John Keeping | 091a6eb | 2013-06-16 15:18:18 +0100 | [diff] [blame] | 380 | if test -n "$reference_path" |
| 381 | then |
| 382 | is_absolute_path "$reference_path" || |
| 383 | reference_path="$wt_prefix$reference_path" |
| 384 | |
| 385 | reference="--reference=$reference_path" |
| 386 | fi |
| 387 | |
Sven Verdoolaege | ecda072 | 2007-06-24 23:06:07 +0200 | [diff] [blame] | 388 | repo=$1 |
Ramsay Jones | 64394e3 | 2012-04-17 19:00:58 +0100 | [diff] [blame] | 389 | sm_path=$2 |
Sven Verdoolaege | ecda072 | 2007-06-24 23:06:07 +0200 | [diff] [blame] | 390 | |
Ramsay Jones | 64394e3 | 2012-04-17 19:00:58 +0100 | [diff] [blame] | 391 | if test -z "$sm_path"; then |
Junio C Hamano | 6a06623 | 2014-06-10 08:33:39 -0700 | [diff] [blame] | 392 | sm_path=$(printf '%s\n' "$repo" | |
Jens Lehmann | 1414e57 | 2009-09-22 17:10:12 +0200 | [diff] [blame] | 393 | sed -e 's|/$||' -e 's|:*/*\.git$||' -e 's|.*[/:]||g') |
| 394 | fi |
| 395 | |
Elia Pinto | 496eeeb | 2014-06-10 05:28:33 -0700 | [diff] [blame] | 396 | if test -z "$repo" || test -z "$sm_path"; then |
Sven Verdoolaege | ecda072 | 2007-06-24 23:06:07 +0200 | [diff] [blame] | 397 | usage |
| 398 | fi |
| 399 | |
John Keeping | 091a6eb | 2013-06-16 15:18:18 +0100 | [diff] [blame] | 400 | is_absolute_path "$sm_path" || sm_path="$wt_prefix$sm_path" |
| 401 | |
Mark Levedahl | ec05df3 | 2008-07-09 21:05:40 -0400 | [diff] [blame] | 402 | # assure repo is absolute or relative to parent |
| 403 | case "$repo" in |
| 404 | ./*|../*) |
John Keeping | 091a6eb | 2013-06-16 15:18:18 +0100 | [diff] [blame] | 405 | test -z "$wt_prefix" || |
| 406 | die "$(gettext "Relative path can only be used from the toplevel of the working tree")" |
| 407 | |
Mark Levedahl | ec05df3 | 2008-07-09 21:05:40 -0400 | [diff] [blame] | 408 | # dereference source url relative to parent's url |
| 409 | realrepo=$(resolve_relative_url "$repo") || exit |
| 410 | ;; |
| 411 | *:*|/*) |
| 412 | # absolute url |
| 413 | realrepo=$repo |
| 414 | ;; |
| 415 | *) |
Ævar Arnfjörð Bjarmason | 497ee87 | 2011-05-21 18:44:01 +0000 | [diff] [blame] | 416 | die "$(eval_gettext "repo URL: '\$repo' must be absolute or begin with ./|../")" |
Mark Levedahl | ec05df3 | 2008-07-09 21:05:40 -0400 | [diff] [blame] | 417 | ;; |
| 418 | esac |
| 419 | |
Michael J Gruber | db75ada | 2009-03-03 16:08:21 +0100 | [diff] [blame] | 420 | # normalize path: |
| 421 | # multiple //; leading ./; /./; /../; trailing / |
Ramsay Jones | 64394e3 | 2012-04-17 19:00:58 +0100 | [diff] [blame] | 422 | sm_path=$(printf '%s/\n' "$sm_path" | |
Michael J Gruber | db75ada | 2009-03-03 16:08:21 +0100 | [diff] [blame] | 423 | sed -e ' |
| 424 | s|//*|/|g |
| 425 | s|^\(\./\)*|| |
Patrick Steinhardt | 8196e72 | 2015-01-30 16:14:03 +0100 | [diff] [blame] | 426 | s|/\(\./\)*|/|g |
Michael J Gruber | db75ada | 2009-03-03 16:08:21 +0100 | [diff] [blame] | 427 | :start |
| 428 | s|\([^/]*\)/\.\./|| |
| 429 | tstart |
| 430 | s|/*$|| |
| 431 | ') |
Ramsay Jones | 64394e3 | 2012-04-17 19:00:58 +0100 | [diff] [blame] | 432 | git ls-files --error-unmatch "$sm_path" > /dev/null 2>&1 && |
| 433 | die "$(eval_gettext "'\$sm_path' already exists in the index")" |
Sven Verdoolaege | ecda072 | 2007-06-24 23:06:07 +0200 | [diff] [blame] | 434 | |
Ramsay Jones | 64394e3 | 2012-04-17 19:00:58 +0100 | [diff] [blame] | 435 | if test -z "$force" && ! git add --dry-run --ignore-missing "$sm_path" > /dev/null 2>&1 |
Jens Lehmann | d27b876 | 2010-07-17 17:11:43 +0200 | [diff] [blame] | 436 | then |
Jon Seymour | 6ff875c | 2011-08-07 21:58:17 +1000 | [diff] [blame] | 437 | eval_gettextln "The following path is ignored by one of your .gitignore files: |
Ramsay Jones | 64394e3 | 2012-04-17 19:00:58 +0100 | [diff] [blame] | 438 | \$sm_path |
Jon Seymour | 6ff875c | 2011-08-07 21:58:17 +1000 | [diff] [blame] | 439 | Use -f if you really want to add it." >&2 |
Jens Lehmann | d27b876 | 2010-07-17 17:11:43 +0200 | [diff] [blame] | 440 | exit 1 |
| 441 | fi |
| 442 | |
Jens Lehmann | 73b0898 | 2012-09-30 01:05:58 +0200 | [diff] [blame] | 443 | if test -n "$custom_name" |
| 444 | then |
| 445 | sm_name="$custom_name" |
| 446 | else |
| 447 | sm_name="$sm_path" |
| 448 | fi |
| 449 | |
Mark Levedahl | d4264ca | 2008-03-04 20:15:02 -0500 | [diff] [blame] | 450 | # perhaps the path exists and is already a git repo, else clone it |
Ramsay Jones | 64394e3 | 2012-04-17 19:00:58 +0100 | [diff] [blame] | 451 | if test -e "$sm_path" |
Mark Levedahl | d4264ca | 2008-03-04 20:15:02 -0500 | [diff] [blame] | 452 | then |
Elia Pinto | 496eeeb | 2014-06-10 05:28:33 -0700 | [diff] [blame] | 453 | if test -d "$sm_path"/.git || test -f "$sm_path"/.git |
Mark Levedahl | d4264ca | 2008-03-04 20:15:02 -0500 | [diff] [blame] | 454 | then |
Ramsay Jones | 64394e3 | 2012-04-17 19:00:58 +0100 | [diff] [blame] | 455 | eval_gettextln "Adding existing repo at '\$sm_path' to the index" |
Mark Levedahl | d4264ca | 2008-03-04 20:15:02 -0500 | [diff] [blame] | 456 | else |
Ramsay Jones | 64394e3 | 2012-04-17 19:00:58 +0100 | [diff] [blame] | 457 | die "$(eval_gettext "'\$sm_path' already exists and is not a valid git repo")" |
Mark Levedahl | d4264ca | 2008-03-04 20:15:02 -0500 | [diff] [blame] | 458 | fi |
Mark Levedahl | c2f9391 | 2008-07-09 21:05:41 -0400 | [diff] [blame] | 459 | |
Mark Levedahl | d4264ca | 2008-03-04 20:15:02 -0500 | [diff] [blame] | 460 | else |
Jens Lehmann | 4b7c286 | 2012-09-30 23:01:29 +0200 | [diff] [blame] | 461 | if test -d ".git/modules/$sm_name" |
| 462 | then |
| 463 | if test -z "$force" |
| 464 | then |
| 465 | echo >&2 "$(eval_gettext "A git directory for '\$sm_name' is found locally with remote(s):")" |
| 466 | GIT_DIR=".git/modules/$sm_name" GIT_WORK_TREE=. git remote -v | grep '(fetch)' | sed -e s,^," ", -e s,' (fetch)',, >&2 |
| 467 | echo >&2 "$(eval_gettext "If you want to reuse this local git directory instead of cloning again from")" |
| 468 | echo >&2 " $realrepo" |
| 469 | echo >&2 "$(eval_gettext "use the '--force' option. If the local git directory is not the correct repo")" |
| 470 | die "$(eval_gettext "or you are unsure what this means choose another name with the '--name' option.")" |
| 471 | else |
| 472 | echo "$(eval_gettext "Reactivating local git directory for submodule '\$sm_name'.")" |
| 473 | fi |
| 474 | fi |
Junio C Hamano | d851ffb | 2014-04-02 14:15:36 -0700 | [diff] [blame] | 475 | module_clone "$sm_path" "$sm_name" "$realrepo" "$reference" "$depth" || exit |
| 476 | ( |
| 477 | clear_local_git_env |
| 478 | cd "$sm_path" && |
| 479 | # ash fails to wordsplit ${branch:+-b "$branch"...} |
| 480 | case "$branch" in |
| 481 | '') git checkout -f -q ;; |
| 482 | ?*) git checkout -f -q -B "$branch" "origin/$branch" ;; |
| 483 | esac |
| 484 | ) || die "$(eval_gettext "Unable to checkout submodule '\$sm_path'")" |
Mark Levedahl | d4264ca | 2008-03-04 20:15:02 -0500 | [diff] [blame] | 485 | fi |
Jens Lehmann | 73b0898 | 2012-09-30 01:05:58 +0200 | [diff] [blame] | 486 | git config submodule."$sm_name".url "$realrepo" |
Mark Levedahl | d4264ca | 2008-03-04 20:15:02 -0500 | [diff] [blame] | 487 | |
Ramsay Jones | 64394e3 | 2012-04-17 19:00:58 +0100 | [diff] [blame] | 488 | git add $force "$sm_path" || |
| 489 | die "$(eval_gettext "Failed to add submodule '\$sm_path'")" |
Sven Verdoolaege | ecda072 | 2007-06-24 23:06:07 +0200 | [diff] [blame] | 490 | |
Jens Lehmann | 73b0898 | 2012-09-30 01:05:58 +0200 | [diff] [blame] | 491 | git config -f .gitmodules submodule."$sm_name".path "$sm_path" && |
| 492 | git config -f .gitmodules submodule."$sm_name".url "$repo" && |
W. Trevor King | b928922 | 2012-12-19 11:03:33 -0500 | [diff] [blame] | 493 | if test -n "$branch" |
| 494 | then |
| 495 | git config -f .gitmodules submodule."$sm_name".branch "$branch" |
| 496 | fi && |
Ævar Arnfjörð Bjarmason | 31991b0 | 2010-07-05 17:33:03 +0000 | [diff] [blame] | 497 | git add --force .gitmodules || |
Ramsay Jones | 64394e3 | 2012-04-17 19:00:58 +0100 | [diff] [blame] | 498 | die "$(eval_gettext "Failed to register submodule '\$sm_path'")" |
Sven Verdoolaege | ecda072 | 2007-06-24 23:06:07 +0200 | [diff] [blame] | 499 | } |
| 500 | |
| 501 | # |
Mark Levedahl | 19a31f9 | 2008-08-10 19:10:04 -0400 | [diff] [blame] | 502 | # Execute an arbitrary command sequence in each checked out |
| 503 | # submodule |
| 504 | # |
| 505 | # $@ = command to execute |
| 506 | # |
| 507 | cmd_foreach() |
| 508 | { |
Johan Herland | 1d5bec8 | 2009-08-19 03:45:19 +0200 | [diff] [blame] | 509 | # parse $args after "submodule ... foreach". |
| 510 | while test $# -ne 0 |
| 511 | do |
| 512 | case "$1" in |
| 513 | -q|--quiet) |
| 514 | GIT_QUIET=1 |
| 515 | ;; |
Johan Herland | 15fc56a | 2009-08-19 03:45:22 +0200 | [diff] [blame] | 516 | --recursive) |
| 517 | recursive=1 |
| 518 | ;; |
Johan Herland | 1d5bec8 | 2009-08-19 03:45:19 +0200 | [diff] [blame] | 519 | -*) |
| 520 | usage |
| 521 | ;; |
| 522 | *) |
| 523 | break |
| 524 | ;; |
| 525 | esac |
| 526 | shift |
| 527 | done |
| 528 | |
Ævar Arnfjörð Bjarmason | f030c96 | 2010-05-21 16:10:10 +0000 | [diff] [blame] | 529 | toplevel=$(pwd) |
| 530 | |
Brandon Casey | 4dca1aa | 2011-06-29 19:34:58 -0500 | [diff] [blame] | 531 | # dup stdin so that it can be restored when running the external |
| 532 | # command in the subshell (and a recursive call to this function) |
| 533 | exec 3<&0 |
| 534 | |
David Aguilar | a7b3269 | 2008-08-22 00:30:50 -0700 | [diff] [blame] | 535 | module_list | |
Ramsay Jones | 64394e3 | 2012-04-17 19:00:58 +0100 | [diff] [blame] | 536 | while read mode sha1 stage sm_path |
Mark Levedahl | 19a31f9 | 2008-08-10 19:10:04 -0400 | [diff] [blame] | 537 | do |
Heiko Voigt | be9d0a3 | 2012-08-14 22:35:27 +0200 | [diff] [blame] | 538 | die_if_unmatched "$mode" |
Ramsay Jones | 64394e3 | 2012-04-17 19:00:58 +0100 | [diff] [blame] | 539 | if test -e "$sm_path"/.git |
Mark Levedahl | 19a31f9 | 2008-08-10 19:10:04 -0400 | [diff] [blame] | 540 | then |
John Keeping | 091a6eb | 2013-06-16 15:18:18 +0100 | [diff] [blame] | 541 | displaypath=$(relative_path "$sm_path") |
| 542 | say "$(eval_gettext "Entering '\$prefix\$displaypath'")" |
Ramsay Jones | 64394e3 | 2012-04-17 19:00:58 +0100 | [diff] [blame] | 543 | name=$(module_name "$sm_path") |
Johan Herland | 15fc56a | 2009-08-19 03:45:22 +0200 | [diff] [blame] | 544 | ( |
Ramsay Jones | 64394e3 | 2012-04-17 19:00:58 +0100 | [diff] [blame] | 545 | prefix="$prefix$sm_path/" |
Giuseppe Bilotta | 74ae141 | 2010-02-25 00:34:17 +0100 | [diff] [blame] | 546 | clear_local_git_env |
Ramsay Jones | 64394e3 | 2012-04-17 19:00:58 +0100 | [diff] [blame] | 547 | cd "$sm_path" && |
John Keeping | 091a6eb | 2013-06-16 15:18:18 +0100 | [diff] [blame] | 548 | sm_path=$(relative_path "$sm_path") && |
| 549 | # we make $path available to scripts ... |
| 550 | path=$sm_path && |
Anders Kaseorg | 1c4fb13 | 2013-09-27 06:23:55 -0400 | [diff] [blame] | 551 | if test $# -eq 1 |
| 552 | then |
| 553 | eval "$1" |
| 554 | else |
| 555 | "$@" |
| 556 | fi && |
Johan Herland | 15fc56a | 2009-08-19 03:45:22 +0200 | [diff] [blame] | 557 | if test -n "$recursive" |
| 558 | then |
| 559 | cmd_foreach "--recursive" "$@" |
| 560 | fi |
Brandon Casey | 4dca1aa | 2011-06-29 19:34:58 -0500 | [diff] [blame] | 561 | ) <&3 3<&- || |
John Keeping | 091a6eb | 2013-06-16 15:18:18 +0100 | [diff] [blame] | 562 | die "$(eval_gettext "Stopping at '\$prefix\$displaypath'; script returned non-zero status.")" |
Mark Levedahl | 19a31f9 | 2008-08-10 19:10:04 -0400 | [diff] [blame] | 563 | fi |
| 564 | done |
| 565 | } |
| 566 | |
| 567 | # |
Lars Hjemli | 211b7f1 | 2007-06-06 11:13:02 +0200 | [diff] [blame] | 568 | # Register submodules in .git/config |
Lars Hjemli | 70c7ac2 | 2007-05-26 15:56:40 +0200 | [diff] [blame] | 569 | # |
| 570 | # $@ = requested paths (default to all) |
| 571 | # |
Junio C Hamano | 23a485e | 2008-01-15 02:35:49 -0800 | [diff] [blame] | 572 | cmd_init() |
Lars Hjemli | 70c7ac2 | 2007-05-26 15:56:40 +0200 | [diff] [blame] | 573 | { |
Junio C Hamano | 5c08dbb | 2008-01-15 02:48:45 -0800 | [diff] [blame] | 574 | # parse $args after "submodule ... init". |
| 575 | while test $# -ne 0 |
| 576 | do |
| 577 | case "$1" in |
| 578 | -q|--quiet) |
Stephen Boyd | 2e6a30e | 2009-06-16 15:33:00 -0700 | [diff] [blame] | 579 | GIT_QUIET=1 |
Junio C Hamano | 5c08dbb | 2008-01-15 02:48:45 -0800 | [diff] [blame] | 580 | ;; |
| 581 | --) |
| 582 | shift |
| 583 | break |
| 584 | ;; |
| 585 | -*) |
| 586 | usage |
| 587 | ;; |
| 588 | *) |
| 589 | break |
| 590 | ;; |
| 591 | esac |
| 592 | shift |
| 593 | done |
| 594 | |
David Aguilar | a7b3269 | 2008-08-22 00:30:50 -0700 | [diff] [blame] | 595 | module_list "$@" | |
Ramsay Jones | 64394e3 | 2012-04-17 19:00:58 +0100 | [diff] [blame] | 596 | while read mode sha1 stage sm_path |
Lars Hjemli | 70c7ac2 | 2007-05-26 15:56:40 +0200 | [diff] [blame] | 597 | do |
Heiko Voigt | be9d0a3 | 2012-08-14 22:35:27 +0200 | [diff] [blame] | 598 | die_if_unmatched "$mode" |
Ramsay Jones | 64394e3 | 2012-04-17 19:00:58 +0100 | [diff] [blame] | 599 | name=$(module_name "$sm_path") || exit |
Jens Lehmann | c1c259e | 2012-05-28 21:46:58 +0200 | [diff] [blame] | 600 | |
John Keeping | 091a6eb | 2013-06-16 15:18:18 +0100 | [diff] [blame] | 601 | displaypath=$(relative_path "$sm_path") |
| 602 | |
Jens Lehmann | c1c259e | 2012-05-28 21:46:58 +0200 | [diff] [blame] | 603 | # Copy url setting when it is not set yet |
Jens Lehmann | 2cd9de3 | 2011-06-26 01:26:02 +0200 | [diff] [blame] | 604 | if test -z "$(git config "submodule.$name.url")" |
| 605 | then |
| 606 | url=$(git config -f .gitmodules submodule."$name".url) |
| 607 | test -z "$url" && |
John Keeping | 091a6eb | 2013-06-16 15:18:18 +0100 | [diff] [blame] | 608 | die "$(eval_gettext "No url found for submodule path '\$displaypath' in .gitmodules")" |
Lars Hjemli | 70c7ac2 | 2007-05-26 15:56:40 +0200 | [diff] [blame] | 609 | |
Jens Lehmann | 2cd9de3 | 2011-06-26 01:26:02 +0200 | [diff] [blame] | 610 | # Possibly a url relative to parent |
| 611 | case "$url" in |
| 612 | ./*|../*) |
| 613 | url=$(resolve_relative_url "$url") || exit |
| 614 | ;; |
| 615 | esac |
| 616 | git config submodule."$name".url "$url" || |
John Keeping | 091a6eb | 2013-06-16 15:18:18 +0100 | [diff] [blame] | 617 | die "$(eval_gettext "Failed to register url for submodule path '\$displaypath'")" |
Jens Lehmann | c1c259e | 2012-05-28 21:46:58 +0200 | [diff] [blame] | 618 | |
John Keeping | 091a6eb | 2013-06-16 15:18:18 +0100 | [diff] [blame] | 619 | say "$(eval_gettext "Submodule '\$name' (\$url) registered for path '\$displaypath'")" |
Jens Lehmann | 2cd9de3 | 2011-06-26 01:26:02 +0200 | [diff] [blame] | 620 | fi |
Lars Hjemli | 70c7ac2 | 2007-05-26 15:56:40 +0200 | [diff] [blame] | 621 | |
Jens Lehmann | 2cd9de3 | 2011-06-26 01:26:02 +0200 | [diff] [blame] | 622 | # Copy "update" setting when it is not set yet |
Junio C Hamano | ac1fbbd | 2013-12-02 13:31:55 -0800 | [diff] [blame] | 623 | if upd="$(git config -f .gitmodules submodule."$name".update)" && |
| 624 | test -n "$upd" && |
| 625 | test -z "$(git config submodule."$name".update)" |
| 626 | then |
| 627 | case "$upd" in |
Francesco Pretto | efa8fd7 | 2014-01-05 03:50:48 +0100 | [diff] [blame] | 628 | checkout | rebase | merge | none) |
Junio C Hamano | ac1fbbd | 2013-12-02 13:31:55 -0800 | [diff] [blame] | 629 | ;; # known modes of updating |
| 630 | *) |
| 631 | echo >&2 "warning: unknown update mode '$upd' suggested for submodule '$name'" |
| 632 | upd=none |
| 633 | ;; |
| 634 | esac |
| 635 | git config submodule."$name".update "$upd" || |
| 636 | die "$(eval_gettext "Failed to register update mode for submodule path '\$displaypath'")" |
| 637 | fi |
Lars Hjemli | 70c7ac2 | 2007-05-26 15:56:40 +0200 | [diff] [blame] | 638 | done |
| 639 | } |
| 640 | |
| 641 | # |
Jens Lehmann | cf41982 | 2013-03-04 22:20:24 +0100 | [diff] [blame] | 642 | # Unregister submodules from .git/config and remove their work tree |
| 643 | # |
| 644 | # $@ = requested paths (use '.' to deinit all submodules) |
| 645 | # |
| 646 | cmd_deinit() |
| 647 | { |
| 648 | # parse $args after "submodule ... deinit". |
| 649 | while test $# -ne 0 |
| 650 | do |
| 651 | case "$1" in |
| 652 | -f|--force) |
| 653 | force=$1 |
| 654 | ;; |
| 655 | -q|--quiet) |
| 656 | GIT_QUIET=1 |
| 657 | ;; |
| 658 | --) |
| 659 | shift |
| 660 | break |
| 661 | ;; |
| 662 | -*) |
| 663 | usage |
| 664 | ;; |
| 665 | *) |
| 666 | break |
| 667 | ;; |
| 668 | esac |
| 669 | shift |
| 670 | done |
| 671 | |
| 672 | if test $# = 0 |
| 673 | then |
| 674 | die "$(eval_gettext "Use '.' if you really want to deinitialize all submodules")" |
| 675 | fi |
| 676 | |
| 677 | module_list "$@" | |
| 678 | while read mode sha1 stage sm_path |
| 679 | do |
| 680 | die_if_unmatched "$mode" |
| 681 | name=$(module_name "$sm_path") || exit |
| 682 | |
John Keeping | 091a6eb | 2013-06-16 15:18:18 +0100 | [diff] [blame] | 683 | displaypath=$(relative_path "$sm_path") |
| 684 | |
Jens Lehmann | cf41982 | 2013-03-04 22:20:24 +0100 | [diff] [blame] | 685 | # Remove the submodule work tree (unless the user already did it) |
| 686 | if test -d "$sm_path" |
| 687 | then |
| 688 | # Protect submodules containing a .git directory |
| 689 | if test -d "$sm_path/.git" |
| 690 | then |
John Keeping | 091a6eb | 2013-06-16 15:18:18 +0100 | [diff] [blame] | 691 | echo >&2 "$(eval_gettext "Submodule work tree '\$displaypath' contains a .git directory")" |
Jens Lehmann | cf41982 | 2013-03-04 22:20:24 +0100 | [diff] [blame] | 692 | die "$(eval_gettext "(use 'rm -rf' if you really want to remove it including all of its history)")" |
| 693 | fi |
| 694 | |
| 695 | if test -z "$force" |
| 696 | then |
Jens Lehmann | 7b294bf | 2013-04-01 21:02:00 +0200 | [diff] [blame] | 697 | git rm -qn "$sm_path" || |
John Keeping | 091a6eb | 2013-06-16 15:18:18 +0100 | [diff] [blame] | 698 | die "$(eval_gettext "Submodule work tree '\$displaypath' contains local modifications; use '-f' to discard them")" |
Jens Lehmann | cf41982 | 2013-03-04 22:20:24 +0100 | [diff] [blame] | 699 | fi |
Jens Lehmann | 7b294bf | 2013-04-01 21:02:00 +0200 | [diff] [blame] | 700 | rm -rf "$sm_path" && |
John Keeping | 091a6eb | 2013-06-16 15:18:18 +0100 | [diff] [blame] | 701 | say "$(eval_gettext "Cleared directory '\$displaypath'")" || |
| 702 | say "$(eval_gettext "Could not remove submodule work tree '\$displaypath'")" |
Jens Lehmann | cf41982 | 2013-03-04 22:20:24 +0100 | [diff] [blame] | 703 | fi |
| 704 | |
John Keeping | 091a6eb | 2013-06-16 15:18:18 +0100 | [diff] [blame] | 705 | mkdir "$sm_path" || say "$(eval_gettext "Could not create empty submodule directory '\$displaypath'")" |
Jens Lehmann | cf41982 | 2013-03-04 22:20:24 +0100 | [diff] [blame] | 706 | |
| 707 | # Remove the .git/config entries (unless the user already did it) |
| 708 | if test -n "$(git config --get-regexp submodule."$name\.")" |
| 709 | then |
| 710 | # Remove the whole section so we have a clean state when |
| 711 | # the user later decides to init this submodule again |
| 712 | url=$(git config submodule."$name".url) |
| 713 | git config --remove-section submodule."$name" 2>/dev/null && |
John Keeping | 091a6eb | 2013-06-16 15:18:18 +0100 | [diff] [blame] | 714 | say "$(eval_gettext "Submodule '\$name' (\$url) unregistered for path '\$displaypath'")" |
Jens Lehmann | cf41982 | 2013-03-04 22:20:24 +0100 | [diff] [blame] | 715 | fi |
| 716 | done |
| 717 | } |
| 718 | |
| 719 | # |
Lars Hjemli | 211b7f1 | 2007-06-06 11:13:02 +0200 | [diff] [blame] | 720 | # 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] | 721 | # |
| 722 | # $@ = requested paths (default to all) |
| 723 | # |
Junio C Hamano | 23a485e | 2008-01-15 02:35:49 -0800 | [diff] [blame] | 724 | cmd_update() |
Lars Hjemli | 70c7ac2 | 2007-05-26 15:56:40 +0200 | [diff] [blame] | 725 | { |
Junio C Hamano | 5c08dbb | 2008-01-15 02:48:45 -0800 | [diff] [blame] | 726 | # parse $args after "submodule ... update". |
| 727 | while test $# -ne 0 |
| 728 | do |
| 729 | case "$1" in |
| 730 | -q|--quiet) |
Stephen Boyd | 2e6a30e | 2009-06-16 15:33:00 -0700 | [diff] [blame] | 731 | GIT_QUIET=1 |
Junio C Hamano | 5c08dbb | 2008-01-15 02:48:45 -0800 | [diff] [blame] | 732 | ;; |
Johannes Schindelin | be4d2c8 | 2008-05-16 11:23:03 +0100 | [diff] [blame] | 733 | -i|--init) |
Michael S. Tsirkin | d92a395 | 2009-05-04 22:30:01 +0300 | [diff] [blame] | 734 | init=1 |
Johannes Schindelin | be4d2c8 | 2008-05-16 11:23:03 +0100 | [diff] [blame] | 735 | ;; |
W. Trevor King | 06b1abb | 2012-12-19 11:03:32 -0500 | [diff] [blame] | 736 | --remote) |
| 737 | remote=1 |
| 738 | ;; |
Fabian Franz | 31ca3ac | 2009-02-05 20:18:32 -0200 | [diff] [blame] | 739 | -N|--no-fetch) |
Fabian Franz | 31ca3ac | 2009-02-05 20:18:32 -0200 | [diff] [blame] | 740 | nofetch=1 |
| 741 | ;; |
Nicolas Morey-Chaisemartin | 9db31bd | 2011-04-01 11:42:03 +0200 | [diff] [blame] | 742 | -f|--force) |
| 743 | force=$1 |
| 744 | ;; |
Peter Hutterer | ca2cedb | 2009-04-24 09:06:38 +1000 | [diff] [blame] | 745 | -r|--rebase) |
Johan Herland | 3294842 | 2009-06-03 08:27:06 +0200 | [diff] [blame] | 746 | update="rebase" |
Peter Hutterer | ca2cedb | 2009-04-24 09:06:38 +1000 | [diff] [blame] | 747 | ;; |
Michael S. Tsirkin | d92a395 | 2009-05-04 22:30:01 +0300 | [diff] [blame] | 748 | --reference) |
| 749 | case "$2" in '') usage ;; esac |
| 750 | reference="--reference=$2" |
Kevin Ballard | 98dbe63 | 2010-11-02 23:26:25 -0700 | [diff] [blame] | 751 | shift |
Michael S. Tsirkin | d92a395 | 2009-05-04 22:30:01 +0300 | [diff] [blame] | 752 | ;; |
| 753 | --reference=*) |
| 754 | reference="$1" |
Michael S. Tsirkin | d92a395 | 2009-05-04 22:30:01 +0300 | [diff] [blame] | 755 | ;; |
Johan Herland | 42b4917 | 2009-06-03 00:59:12 +0200 | [diff] [blame] | 756 | -m|--merge) |
Johan Herland | 42b4917 | 2009-06-03 00:59:12 +0200 | [diff] [blame] | 757 | update="merge" |
| 758 | ;; |
Johan Herland | b13fd5c | 2009-08-19 03:45:23 +0200 | [diff] [blame] | 759 | --recursive) |
Johan Herland | b13fd5c | 2009-08-19 03:45:23 +0200 | [diff] [blame] | 760 | recursive=1 |
| 761 | ;; |
Junio C Hamano | efc5fb6 | 2011-10-10 15:56:16 -0700 | [diff] [blame] | 762 | --checkout) |
| 763 | update="checkout" |
| 764 | ;; |
Fredrik Gustafsson | 275cd18 | 2013-07-02 23:42:56 +0200 | [diff] [blame] | 765 | --depth) |
| 766 | case "$2" in '') usage ;; esac |
| 767 | depth="--depth=$2" |
| 768 | shift |
| 769 | ;; |
| 770 | --depth=*) |
| 771 | depth=$1 |
| 772 | ;; |
Junio C Hamano | 5c08dbb | 2008-01-15 02:48:45 -0800 | [diff] [blame] | 773 | --) |
| 774 | shift |
| 775 | break |
| 776 | ;; |
| 777 | -*) |
| 778 | usage |
| 779 | ;; |
| 780 | *) |
| 781 | break |
| 782 | ;; |
| 783 | esac |
Kevin Ballard | 98dbe63 | 2010-11-02 23:26:25 -0700 | [diff] [blame] | 784 | shift |
Junio C Hamano | 5c08dbb | 2008-01-15 02:48:45 -0800 | [diff] [blame] | 785 | done |
| 786 | |
Michael S. Tsirkin | d92a395 | 2009-05-04 22:30:01 +0300 | [diff] [blame] | 787 | if test -n "$init" |
| 788 | then |
| 789 | cmd_init "--" "$@" || return |
| 790 | fi |
| 791 | |
Spencer E. Olson | 1b4735d | 2011-02-17 09:18:45 -0700 | [diff] [blame] | 792 | cloned_modules= |
Fredrik Gustafsson | 15ffb7c | 2011-06-13 19:15:26 +0200 | [diff] [blame] | 793 | module_list "$@" | { |
| 794 | err= |
Ramsay Jones | 64394e3 | 2012-04-17 19:00:58 +0100 | [diff] [blame] | 795 | while read mode sha1 stage sm_path |
Lars Hjemli | 70c7ac2 | 2007-05-26 15:56:40 +0200 | [diff] [blame] | 796 | do |
Heiko Voigt | be9d0a3 | 2012-08-14 22:35:27 +0200 | [diff] [blame] | 797 | die_if_unmatched "$mode" |
Nicolas Morey-Chaisemartin | 313ee0d | 2011-03-30 07:20:02 +0200 | [diff] [blame] | 798 | if test "$stage" = U |
| 799 | then |
William Entriken | 75bf5e6 | 2013-03-02 14:44:59 -0500 | [diff] [blame] | 800 | echo >&2 "Skipping unmerged submodule $prefix$sm_path" |
Nicolas Morey-Chaisemartin | 313ee0d | 2011-03-30 07:20:02 +0200 | [diff] [blame] | 801 | continue |
| 802 | fi |
Ramsay Jones | 64394e3 | 2012-04-17 19:00:58 +0100 | [diff] [blame] | 803 | name=$(module_name "$sm_path") || exit |
Junio C Hamano | 5be6007 | 2007-07-02 22:52:14 -0700 | [diff] [blame] | 804 | url=$(git config submodule."$name".url) |
Junio C Hamano | d851ffb | 2014-04-02 14:15:36 -0700 | [diff] [blame] | 805 | branch=$(get_submodule_config "$name" branch master) |
Junio C Hamano | efc5fb6 | 2011-10-10 15:56:16 -0700 | [diff] [blame] | 806 | if ! test -z "$update" |
| 807 | then |
| 808 | update_module=$update |
| 809 | else |
| 810 | update_module=$(git config submodule."$name".update) |
W. Trevor King | a2aed08 | 2014-01-15 20:10:22 -0800 | [diff] [blame] | 811 | if test -z "$update_module" |
| 812 | then |
| 813 | update_module="checkout" |
| 814 | fi |
Junio C Hamano | efc5fb6 | 2011-10-10 15:56:16 -0700 | [diff] [blame] | 815 | fi |
| 816 | |
John Keeping | 091a6eb | 2013-06-16 15:18:18 +0100 | [diff] [blame] | 817 | displaypath=$(relative_path "$prefix$sm_path") |
| 818 | |
Junio C Hamano | d851ffb | 2014-04-02 14:15:36 -0700 | [diff] [blame] | 819 | if test "$update_module" = "none" |
| 820 | then |
John Keeping | 091a6eb | 2013-06-16 15:18:18 +0100 | [diff] [blame] | 821 | echo "Skipping submodule '$displaypath'" |
Junio C Hamano | efc5fb6 | 2011-10-10 15:56:16 -0700 | [diff] [blame] | 822 | continue |
Junio C Hamano | d851ffb | 2014-04-02 14:15:36 -0700 | [diff] [blame] | 823 | fi |
Junio C Hamano | efc5fb6 | 2011-10-10 15:56:16 -0700 | [diff] [blame] | 824 | |
Lars Hjemli | 211b7f1 | 2007-06-06 11:13:02 +0200 | [diff] [blame] | 825 | if test -z "$url" |
Lars Hjemli | 70c7ac2 | 2007-05-26 15:56:40 +0200 | [diff] [blame] | 826 | then |
| 827 | # Only mention uninitialized submodules when its |
| 828 | # path have been specified |
| 829 | test "$#" != "0" && |
John Keeping | 091a6eb | 2013-06-16 15:18:18 +0100 | [diff] [blame] | 830 | say "$(eval_gettext "Submodule path '\$displaypath' not initialized |
Ævar Arnfjörð Bjarmason | 1c2ef66 | 2011-05-21 18:44:08 +0000 | [diff] [blame] | 831 | Maybe you want to use 'update --init'?")" |
Lars Hjemli | 211b7f1 | 2007-06-06 11:13:02 +0200 | [diff] [blame] | 832 | continue |
Lars Hjemli | 70c7ac2 | 2007-05-26 15:56:40 +0200 | [diff] [blame] | 833 | fi |
Lars Hjemli | 211b7f1 | 2007-06-06 11:13:02 +0200 | [diff] [blame] | 834 | |
Elia Pinto | 496eeeb | 2014-06-10 05:28:33 -0700 | [diff] [blame] | 835 | if ! test -d "$sm_path"/.git && ! test -f "$sm_path"/.git |
Lars Hjemli | 211b7f1 | 2007-06-06 11:13:02 +0200 | [diff] [blame] | 836 | then |
Junio C Hamano | d851ffb | 2014-04-02 14:15:36 -0700 | [diff] [blame] | 837 | module_clone "$sm_path" "$name" "$url" "$reference" "$depth" || exit |
Spencer E. Olson | 1b4735d | 2011-02-17 09:18:45 -0700 | [diff] [blame] | 838 | cloned_modules="$cloned_modules;$name" |
Lars Hjemli | bf2d824 | 2007-06-11 21:12:22 +0200 | [diff] [blame] | 839 | subsha1= |
| 840 | else |
Ramsay Jones | 64394e3 | 2012-04-17 19:00:58 +0100 | [diff] [blame] | 841 | subsha1=$(clear_local_git_env; cd "$sm_path" && |
Junio C Hamano | 5be6007 | 2007-07-02 22:52:14 -0700 | [diff] [blame] | 842 | git rev-parse --verify HEAD) || |
John Keeping | 091a6eb | 2013-06-16 15:18:18 +0100 | [diff] [blame] | 843 | die "$(eval_gettext "Unable to find current revision in submodule path '\$displaypath'")" |
Lars Hjemli | 211b7f1 | 2007-06-06 11:13:02 +0200 | [diff] [blame] | 844 | fi |
| 845 | |
W. Trevor King | 06b1abb | 2012-12-19 11:03:32 -0500 | [diff] [blame] | 846 | if test -n "$remote" |
| 847 | then |
| 848 | if test -z "$nofetch" |
| 849 | then |
| 850 | # Fetch remote before determining tracking $sha1 |
| 851 | (clear_local_git_env; cd "$sm_path" && git-fetch) || |
| 852 | die "$(eval_gettext "Unable to fetch in submodule path '\$sm_path'")" |
| 853 | fi |
| 854 | remote_name=$(clear_local_git_env; cd "$sm_path" && get_default_remote) |
| 855 | sha1=$(clear_local_git_env; cd "$sm_path" && |
| 856 | git rev-parse --verify "${remote_name}/${branch}") || |
| 857 | die "$(eval_gettext "Unable to find current ${remote_name}/${branch} revision in submodule path '\$sm_path'")" |
| 858 | fi |
| 859 | |
Elia Pinto | 496eeeb | 2014-06-10 05:28:33 -0700 | [diff] [blame] | 860 | if test "$subsha1" != "$sha1" || test -n "$force" |
Lars Hjemli | 70c7ac2 | 2007-05-26 15:56:40 +0200 | [diff] [blame] | 861 | then |
Nicolas Morey-Chaisemartin | 9db31bd | 2011-04-01 11:42:03 +0200 | [diff] [blame] | 862 | subforce=$force |
| 863 | # If we don't already have a -f flag and the submodule has never been checked out |
Elia Pinto | 496eeeb | 2014-06-10 05:28:33 -0700 | [diff] [blame] | 864 | if test -z "$subsha1" && test -z "$force" |
Ping Yin | b9b378a | 2008-09-26 23:33:23 +0800 | [diff] [blame] | 865 | then |
Nicolas Morey-Chaisemartin | 9db31bd | 2011-04-01 11:42:03 +0200 | [diff] [blame] | 866 | subforce="-f" |
Ping Yin | b9b378a | 2008-09-26 23:33:23 +0800 | [diff] [blame] | 867 | fi |
Fabian Franz | 31ca3ac | 2009-02-05 20:18:32 -0200 | [diff] [blame] | 868 | |
| 869 | if test -z "$nofetch" |
| 870 | then |
Jens Lehmann | e5f522d | 2011-03-06 23:13:36 +0100 | [diff] [blame] | 871 | # Run fetch only if $sha1 isn't present or it |
| 872 | # is not reachable from a ref. |
Ramsay Jones | 64394e3 | 2012-04-17 19:00:58 +0100 | [diff] [blame] | 873 | (clear_local_git_env; cd "$sm_path" && |
Brandon Casey | f5799e0 | 2011-05-26 13:52:04 -0700 | [diff] [blame] | 874 | ( (rev=$(git rev-list -n 1 $sha1 --not --all 2>/dev/null) && |
Jens Lehmann | e5f522d | 2011-03-06 23:13:36 +0100 | [diff] [blame] | 875 | test -z "$rev") || git-fetch)) || |
John Keeping | 091a6eb | 2013-06-16 15:18:18 +0100 | [diff] [blame] | 876 | die "$(eval_gettext "Unable to fetch in submodule path '\$displaypath'")" |
Fabian Franz | 31ca3ac | 2009-02-05 20:18:32 -0200 | [diff] [blame] | 877 | fi |
| 878 | |
Spencer E. Olson | 1b4735d | 2011-02-17 09:18:45 -0700 | [diff] [blame] | 879 | # Is this something we just cloned? |
| 880 | case ";$cloned_modules;" in |
| 881 | *";$name;"*) |
| 882 | # then there is no local change to integrate |
Junio C Hamano | d851ffb | 2014-04-02 14:15:36 -0700 | [diff] [blame] | 883 | update_module=checkout ;; |
Spencer E. Olson | 1b4735d | 2011-02-17 09:18:45 -0700 | [diff] [blame] | 884 | esac |
| 885 | |
Junio C Hamano | 877449c | 2011-06-13 12:17:52 -0700 | [diff] [blame] | 886 | must_die_on_failure= |
Johan Herland | 3294842 | 2009-06-03 08:27:06 +0200 | [diff] [blame] | 887 | case "$update_module" in |
W. Trevor King | a2aed08 | 2014-01-15 20:10:22 -0800 | [diff] [blame] | 888 | checkout) |
| 889 | command="git checkout $subforce -q" |
| 890 | die_msg="$(eval_gettext "Unable to checkout '\$sha1' in submodule path '\$displaypath'")" |
| 891 | say_msg="$(eval_gettext "Submodule path '\$displaypath': checked out '\$sha1'")" |
| 892 | ;; |
Johan Herland | 3294842 | 2009-06-03 08:27:06 +0200 | [diff] [blame] | 893 | rebase) |
| 894 | command="git rebase" |
John Keeping | 091a6eb | 2013-06-16 15:18:18 +0100 | [diff] [blame] | 895 | die_msg="$(eval_gettext "Unable to rebase '\$sha1' in submodule path '\$displaypath'")" |
| 896 | say_msg="$(eval_gettext "Submodule path '\$displaypath': rebased into '\$sha1'")" |
Junio C Hamano | 877449c | 2011-06-13 12:17:52 -0700 | [diff] [blame] | 897 | must_die_on_failure=yes |
Johan Herland | 3294842 | 2009-06-03 08:27:06 +0200 | [diff] [blame] | 898 | ;; |
Johan Herland | 42b4917 | 2009-06-03 00:59:12 +0200 | [diff] [blame] | 899 | merge) |
| 900 | command="git merge" |
John Keeping | 091a6eb | 2013-06-16 15:18:18 +0100 | [diff] [blame] | 901 | die_msg="$(eval_gettext "Unable to merge '\$sha1' in submodule path '\$displaypath'")" |
| 902 | say_msg="$(eval_gettext "Submodule path '\$displaypath': merged in '\$sha1'")" |
Junio C Hamano | 877449c | 2011-06-13 12:17:52 -0700 | [diff] [blame] | 903 | must_die_on_failure=yes |
Johan Herland | 42b4917 | 2009-06-03 00:59:12 +0200 | [diff] [blame] | 904 | ;; |
Chris Packham | 6cb5728 | 2013-07-03 21:02:02 +1200 | [diff] [blame] | 905 | !*) |
| 906 | command="${update_module#!}" |
Alex Henrie | b80fa84 | 2015-08-26 22:26:19 -0600 | [diff] [blame] | 907 | die_msg="$(eval_gettext "Execution of '\$command \$sha1' failed in submodule path '\$prefix\$sm_path'")" |
Chris Packham | 6cb5728 | 2013-07-03 21:02:02 +1200 | [diff] [blame] | 908 | say_msg="$(eval_gettext "Submodule path '\$prefix\$sm_path': '\$command \$sha1'")" |
| 909 | must_die_on_failure=yes |
| 910 | ;; |
Johan Herland | 3294842 | 2009-06-03 08:27:06 +0200 | [diff] [blame] | 911 | *) |
W. Trevor King | a2aed08 | 2014-01-15 20:10:22 -0800 | [diff] [blame] | 912 | die "$(eval_gettext "Invalid update mode '$update_module' for submodule '$name'")" |
Johan Herland | 3294842 | 2009-06-03 08:27:06 +0200 | [diff] [blame] | 913 | esac |
Lars Hjemli | 70c7ac2 | 2007-05-26 15:56:40 +0200 | [diff] [blame] | 914 | |
Ramsay Jones | 64394e3 | 2012-04-17 19:00:58 +0100 | [diff] [blame] | 915 | if (clear_local_git_env; cd "$sm_path" && $command "$sha1") |
Fredrik Gustafsson | 15ffb7c | 2011-06-13 19:15:26 +0200 | [diff] [blame] | 916 | then |
Junio C Hamano | ff968f0 | 2011-07-13 14:31:35 -0700 | [diff] [blame] | 917 | say "$say_msg" |
Junio C Hamano | 877449c | 2011-06-13 12:17:52 -0700 | [diff] [blame] | 918 | elif test -n "$must_die_on_failure" |
| 919 | then |
Junio C Hamano | ff968f0 | 2011-07-13 14:31:35 -0700 | [diff] [blame] | 920 | die_with_status 2 "$die_msg" |
Fredrik Gustafsson | 15ffb7c | 2011-06-13 19:15:26 +0200 | [diff] [blame] | 921 | else |
Junio C Hamano | ff968f0 | 2011-07-13 14:31:35 -0700 | [diff] [blame] | 922 | err="${err};$die_msg" |
Junio C Hamano | 877449c | 2011-06-13 12:17:52 -0700 | [diff] [blame] | 923 | continue |
Fredrik Gustafsson | 15ffb7c | 2011-06-13 19:15:26 +0200 | [diff] [blame] | 924 | fi |
Lars Hjemli | 70c7ac2 | 2007-05-26 15:56:40 +0200 | [diff] [blame] | 925 | fi |
Johan Herland | b13fd5c | 2009-08-19 03:45:23 +0200 | [diff] [blame] | 926 | |
| 927 | if test -n "$recursive" |
| 928 | then |
William Entriken | 75bf5e6 | 2013-03-02 14:44:59 -0500 | [diff] [blame] | 929 | ( |
| 930 | prefix="$prefix$sm_path/" |
| 931 | clear_local_git_env |
| 932 | cd "$sm_path" && |
Jens Lehmann | 3614128 | 2013-11-11 21:55:52 +0100 | [diff] [blame] | 933 | eval cmd_update |
William Entriken | 75bf5e6 | 2013-03-02 14:44:59 -0500 | [diff] [blame] | 934 | ) |
Fredrik Gustafsson | 15ffb7c | 2011-06-13 19:15:26 +0200 | [diff] [blame] | 935 | res=$? |
| 936 | if test $res -gt 0 |
| 937 | then |
John Keeping | 091a6eb | 2013-06-16 15:18:18 +0100 | [diff] [blame] | 938 | die_msg="$(eval_gettext "Failed to recurse into submodule path '\$displaypath'")" |
Fredrik Gustafsson | 15ffb7c | 2011-06-13 19:15:26 +0200 | [diff] [blame] | 939 | if test $res -eq 1 |
| 940 | then |
Junio C Hamano | ff968f0 | 2011-07-13 14:31:35 -0700 | [diff] [blame] | 941 | err="${err};$die_msg" |
Fredrik Gustafsson | 15ffb7c | 2011-06-13 19:15:26 +0200 | [diff] [blame] | 942 | continue |
| 943 | else |
Junio C Hamano | ff968f0 | 2011-07-13 14:31:35 -0700 | [diff] [blame] | 944 | die_with_status $res "$die_msg" |
Fredrik Gustafsson | 15ffb7c | 2011-06-13 19:15:26 +0200 | [diff] [blame] | 945 | fi |
| 946 | fi |
Johan Herland | b13fd5c | 2009-08-19 03:45:23 +0200 | [diff] [blame] | 947 | fi |
Lars Hjemli | 70c7ac2 | 2007-05-26 15:56:40 +0200 | [diff] [blame] | 948 | done |
Fredrik Gustafsson | 15ffb7c | 2011-06-13 19:15:26 +0200 | [diff] [blame] | 949 | |
| 950 | if test -n "$err" |
| 951 | then |
| 952 | OIFS=$IFS |
| 953 | IFS=';' |
| 954 | for e in $err |
| 955 | do |
| 956 | if test -n "$e" |
| 957 | then |
| 958 | echo >&2 "$e" |
| 959 | fi |
| 960 | done |
| 961 | IFS=$OIFS |
| 962 | exit 1 |
| 963 | fi |
| 964 | } |
Lars Hjemli | 70c7ac2 | 2007-05-26 15:56:40 +0200 | [diff] [blame] | 965 | } |
| 966 | |
Emil Medve | bffe71f | 2007-06-26 18:40:58 -0500 | [diff] [blame] | 967 | set_name_rev () { |
| 968 | revname=$( ( |
Giuseppe Bilotta | 74ae141 | 2010-02-25 00:34:17 +0100 | [diff] [blame] | 969 | clear_local_git_env |
Emil Medve | bffe71f | 2007-06-26 18:40:58 -0500 | [diff] [blame] | 970 | cd "$1" && { |
Junio C Hamano | 5be6007 | 2007-07-02 22:52:14 -0700 | [diff] [blame] | 971 | git describe "$2" 2>/dev/null || |
| 972 | git describe --tags "$2" 2>/dev/null || |
Mark Levedahl | f669ac0 | 2008-04-14 22:48:06 -0400 | [diff] [blame] | 973 | git describe --contains "$2" 2>/dev/null || |
| 974 | git describe --all --always "$2" |
Emil Medve | bffe71f | 2007-06-26 18:40:58 -0500 | [diff] [blame] | 975 | } |
| 976 | ) ) |
| 977 | test -z "$revname" || revname=" ($revname)" |
| 978 | } |
Ping Yin | 28f9af5 | 2008-03-11 21:52:15 +0800 | [diff] [blame] | 979 | # |
| 980 | # Show commit summary for submodules in index or working tree |
| 981 | # |
| 982 | # If '--cached' is given, show summary between index and given commit, |
| 983 | # or between working tree and given commit |
| 984 | # |
| 985 | # $@ = [commit (default 'HEAD'),] requested paths (default all) |
| 986 | # |
| 987 | cmd_summary() { |
Ping Yin | f2dc06a | 2008-03-11 21:52:17 +0800 | [diff] [blame] | 988 | summary_limit=-1 |
Ping Yin | d0f64dd | 2008-04-12 23:05:31 +0800 | [diff] [blame] | 989 | for_status= |
Jens Lehmann | 1c244f6 | 2009-08-13 21:32:50 +0200 | [diff] [blame] | 990 | diff_cmd=diff-index |
Emil Medve | bffe71f | 2007-06-26 18:40:58 -0500 | [diff] [blame] | 991 | |
Ping Yin | 28f9af5 | 2008-03-11 21:52:15 +0800 | [diff] [blame] | 992 | # parse $args after "submodule ... summary". |
| 993 | while test $# -ne 0 |
| 994 | do |
| 995 | case "$1" in |
| 996 | --cached) |
| 997 | cached="$1" |
| 998 | ;; |
Jens Lehmann | 1c244f6 | 2009-08-13 21:32:50 +0200 | [diff] [blame] | 999 | --files) |
| 1000 | files="$1" |
| 1001 | ;; |
Ping Yin | d0f64dd | 2008-04-12 23:05:31 +0800 | [diff] [blame] | 1002 | --for-status) |
| 1003 | for_status="$1" |
| 1004 | ;; |
Ping Yin | f2dc06a | 2008-03-11 21:52:17 +0800 | [diff] [blame] | 1005 | -n|--summary-limit) |
René Scharfe | 862ae6c | 2013-04-01 15:06:27 +0200 | [diff] [blame] | 1006 | summary_limit="$2" |
| 1007 | isnumber "$summary_limit" || usage |
Ping Yin | f2dc06a | 2008-03-11 21:52:17 +0800 | [diff] [blame] | 1008 | shift |
| 1009 | ;; |
René Scharfe | 862ae6c | 2013-04-01 15:06:27 +0200 | [diff] [blame] | 1010 | --summary-limit=*) |
| 1011 | summary_limit="${1#--summary-limit=}" |
| 1012 | isnumber "$summary_limit" || usage |
| 1013 | ;; |
Ping Yin | 28f9af5 | 2008-03-11 21:52:15 +0800 | [diff] [blame] | 1014 | --) |
| 1015 | shift |
| 1016 | break |
| 1017 | ;; |
| 1018 | -*) |
| 1019 | usage |
| 1020 | ;; |
| 1021 | *) |
| 1022 | break |
| 1023 | ;; |
| 1024 | esac |
| 1025 | shift |
| 1026 | done |
Lars Hjemli | 70c7ac2 | 2007-05-26 15:56:40 +0200 | [diff] [blame] | 1027 | |
Ping Yin | f2dc06a | 2008-03-11 21:52:17 +0800 | [diff] [blame] | 1028 | test $summary_limit = 0 && return |
| 1029 | |
Johan Herland | 3deea89 | 2010-02-16 11:21:14 +0100 | [diff] [blame] | 1030 | if rev=$(git rev-parse -q --verify --default HEAD ${1+"$1"}) |
Ping Yin | 28f9af5 | 2008-03-11 21:52:15 +0800 | [diff] [blame] | 1031 | then |
| 1032 | head=$rev |
Jeff King | caa9c3c | 2010-03-03 14:19:09 -0800 | [diff] [blame] | 1033 | test $# = 0 || shift |
Elia Pinto | 496eeeb | 2014-06-10 05:28:33 -0700 | [diff] [blame] | 1034 | elif test -z "$1" || test "$1" = "HEAD" |
Johan Herland | 3deea89 | 2010-02-16 11:21:14 +0100 | [diff] [blame] | 1035 | then |
Junio C Hamano | 14e940d | 2010-03-03 14:19:10 -0800 | [diff] [blame] | 1036 | # before the first commit: compare with an empty tree |
| 1037 | head=$(git hash-object -w -t tree --stdin </dev/null) |
Jens Lehmann | 2ea6c2c | 2010-03-09 15:55:32 +0100 | [diff] [blame] | 1038 | test -z "$1" || shift |
Ping Yin | 28f9af5 | 2008-03-11 21:52:15 +0800 | [diff] [blame] | 1039 | else |
Johan Herland | 3deea89 | 2010-02-16 11:21:14 +0100 | [diff] [blame] | 1040 | head="HEAD" |
Ping Yin | 28f9af5 | 2008-03-11 21:52:15 +0800 | [diff] [blame] | 1041 | fi |
| 1042 | |
Jens Lehmann | 1c244f6 | 2009-08-13 21:32:50 +0200 | [diff] [blame] | 1043 | if [ -n "$files" ] |
| 1044 | then |
| 1045 | test -n "$cached" && |
Jiang Xin | 465d6a0 | 2012-07-25 22:53:09 +0800 | [diff] [blame] | 1046 | die "$(gettext "The --cached option cannot be used with the --files option")" |
Jens Lehmann | 1c244f6 | 2009-08-13 21:32:50 +0200 | [diff] [blame] | 1047 | diff_cmd=diff-files |
| 1048 | head= |
| 1049 | fi |
| 1050 | |
Ping Yin | 28f9af5 | 2008-03-11 21:52:15 +0800 | [diff] [blame] | 1051 | cd_to_toplevel |
John Keeping | 091a6eb | 2013-06-16 15:18:18 +0100 | [diff] [blame] | 1052 | eval "set $(git rev-parse --sq --prefix "$wt_prefix" -- "$@")" |
Ping Yin | 28f9af5 | 2008-03-11 21:52:15 +0800 | [diff] [blame] | 1053 | # Get modified modules cared by user |
Jens Lehmann | 1807650 | 2010-06-25 16:56:02 +0200 | [diff] [blame] | 1054 | modules=$(git $diff_cmd $cached --ignore-submodules=dirty --raw $head -- "$@" | |
Junio C Hamano | e1622bf | 2009-11-23 15:56:32 -0800 | [diff] [blame] | 1055 | sane_egrep '^:([0-7]* )?160000' | |
Brian M. Carlson | 2be9450 | 2013-08-17 17:25:42 +0000 | [diff] [blame] | 1056 | while read mod_src mod_dst sha1_src sha1_dst status sm_path |
Ping Yin | 28f9af5 | 2008-03-11 21:52:15 +0800 | [diff] [blame] | 1057 | do |
| 1058 | # Always show modules deleted or type-changed (blob<->module) |
Elia Pinto | 496eeeb | 2014-06-10 05:28:33 -0700 | [diff] [blame] | 1059 | if test "$status" = D || test "$status" = T |
| 1060 | then |
Junio C Hamano | 6a06623 | 2014-06-10 08:33:39 -0700 | [diff] [blame] | 1061 | printf '%s\n' "$sm_path" |
Elia Pinto | 496eeeb | 2014-06-10 05:28:33 -0700 | [diff] [blame] | 1062 | continue |
| 1063 | fi |
Brian M. Carlson | 927b26f | 2013-09-01 20:06:49 +0000 | [diff] [blame] | 1064 | # Respect the ignore setting for --for-status. |
| 1065 | if test -n "$for_status" |
| 1066 | then |
| 1067 | name=$(module_name "$sm_path") |
| 1068 | ignore_config=$(get_submodule_config "$name" ignore none) |
Elia Pinto | 496eeeb | 2014-06-10 05:28:33 -0700 | [diff] [blame] | 1069 | test $status != A && test $ignore_config = all && continue |
Brian M. Carlson | 927b26f | 2013-09-01 20:06:49 +0000 | [diff] [blame] | 1070 | fi |
Ping Yin | 28f9af5 | 2008-03-11 21:52:15 +0800 | [diff] [blame] | 1071 | # Also show added or modified modules which are checked out |
Brian M. Carlson | 2be9450 | 2013-08-17 17:25:42 +0000 | [diff] [blame] | 1072 | GIT_DIR="$sm_path/.git" git-rev-parse --git-dir >/dev/null 2>&1 && |
Junio C Hamano | 6a06623 | 2014-06-10 08:33:39 -0700 | [diff] [blame] | 1073 | printf '%s\n' "$sm_path" |
Ping Yin | 28f9af5 | 2008-03-11 21:52:15 +0800 | [diff] [blame] | 1074 | done |
| 1075 | ) |
Ping Yin | 1cb639e | 2008-03-11 21:52:16 +0800 | [diff] [blame] | 1076 | |
Ping Yin | d0f64dd | 2008-04-12 23:05:31 +0800 | [diff] [blame] | 1077 | test -z "$modules" && return |
| 1078 | |
Jens Lehmann | 1807650 | 2010-06-25 16:56:02 +0200 | [diff] [blame] | 1079 | git $diff_cmd $cached --ignore-submodules=dirty --raw $head -- $modules | |
Junio C Hamano | e1622bf | 2009-11-23 15:56:32 -0800 | [diff] [blame] | 1080 | sane_egrep '^:([0-7]* )?160000' | |
Ping Yin | 1cb639e | 2008-03-11 21:52:16 +0800 | [diff] [blame] | 1081 | cut -c2- | |
| 1082 | while read mod_src mod_dst sha1_src sha1_dst status name |
| 1083 | do |
| 1084 | if test -z "$cached" && |
| 1085 | test $sha1_dst = 0000000000000000000000000000000000000000 |
| 1086 | then |
| 1087 | case "$mod_dst" in |
| 1088 | 160000) |
| 1089 | sha1_dst=$(GIT_DIR="$name/.git" git rev-parse HEAD) |
| 1090 | ;; |
| 1091 | 100644 | 100755 | 120000) |
| 1092 | sha1_dst=$(git hash-object $name) |
| 1093 | ;; |
| 1094 | 000000) |
| 1095 | ;; # removed |
| 1096 | *) |
| 1097 | # unexpected type |
Jon Seymour | 6ff875c | 2011-08-07 21:58:17 +1000 | [diff] [blame] | 1098 | eval_gettextln "unexpected mode \$mod_dst" >&2 |
Ping Yin | 1cb639e | 2008-03-11 21:52:16 +0800 | [diff] [blame] | 1099 | continue ;; |
| 1100 | esac |
| 1101 | fi |
| 1102 | missing_src= |
| 1103 | missing_dst= |
| 1104 | |
| 1105 | test $mod_src = 160000 && |
Miklos Vajna | 30353a4 | 2008-12-03 14:26:52 +0100 | [diff] [blame] | 1106 | ! 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] | 1107 | missing_src=t |
| 1108 | |
| 1109 | test $mod_dst = 160000 && |
Miklos Vajna | 30353a4 | 2008-12-03 14:26:52 +0100 | [diff] [blame] | 1110 | ! 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] | 1111 | missing_dst=t |
| 1112 | |
John Keeping | 091a6eb | 2013-06-16 15:18:18 +0100 | [diff] [blame] | 1113 | display_name=$(relative_path "$name") |
| 1114 | |
Ping Yin | 1cb639e | 2008-03-11 21:52:16 +0800 | [diff] [blame] | 1115 | total_commits= |
| 1116 | case "$missing_src,$missing_dst" in |
| 1117 | t,) |
John Keeping | 091a6eb | 2013-06-16 15:18:18 +0100 | [diff] [blame] | 1118 | errmsg="$(eval_gettext " Warn: \$display_name doesn't contain commit \$sha1_src")" |
Ping Yin | 1cb639e | 2008-03-11 21:52:16 +0800 | [diff] [blame] | 1119 | ;; |
| 1120 | ,t) |
John Keeping | 091a6eb | 2013-06-16 15:18:18 +0100 | [diff] [blame] | 1121 | errmsg="$(eval_gettext " Warn: \$display_name doesn't contain commit \$sha1_dst")" |
Ping Yin | 1cb639e | 2008-03-11 21:52:16 +0800 | [diff] [blame] | 1122 | ;; |
| 1123 | t,t) |
John Keeping | 091a6eb | 2013-06-16 15:18:18 +0100 | [diff] [blame] | 1124 | errmsg="$(eval_gettext " Warn: \$display_name doesn't contain commits \$sha1_src and \$sha1_dst")" |
Ping Yin | 1cb639e | 2008-03-11 21:52:16 +0800 | [diff] [blame] | 1125 | ;; |
| 1126 | *) |
| 1127 | errmsg= |
| 1128 | total_commits=$( |
Elia Pinto | 496eeeb | 2014-06-10 05:28:33 -0700 | [diff] [blame] | 1129 | if test $mod_src = 160000 && test $mod_dst = 160000 |
Ping Yin | 1cb639e | 2008-03-11 21:52:16 +0800 | [diff] [blame] | 1130 | then |
| 1131 | range="$sha1_src...$sha1_dst" |
| 1132 | elif test $mod_src = 160000 |
| 1133 | then |
| 1134 | range=$sha1_src |
| 1135 | else |
| 1136 | range=$sha1_dst |
| 1137 | fi |
| 1138 | GIT_DIR="$name/.git" \ |
Jeff King | b0e621a | 2010-04-08 15:42:37 -0400 | [diff] [blame] | 1139 | git rev-list --first-parent $range -- | wc -l |
Ping Yin | 1cb639e | 2008-03-11 21:52:16 +0800 | [diff] [blame] | 1140 | ) |
Johannes Sixt | eed3559 | 2008-03-12 09:30:01 +0100 | [diff] [blame] | 1141 | total_commits=" ($(($total_commits + 0)))" |
Ping Yin | 1cb639e | 2008-03-11 21:52:16 +0800 | [diff] [blame] | 1142 | ;; |
| 1143 | esac |
| 1144 | |
| 1145 | sha1_abbr_src=$(echo $sha1_src | cut -c1-7) |
| 1146 | sha1_abbr_dst=$(echo $sha1_dst | cut -c1-7) |
| 1147 | if test $status = T |
| 1148 | then |
Ævar Arnfjörð Bjarmason | b3e7344 | 2011-05-21 18:44:09 +0000 | [diff] [blame] | 1149 | blob="$(gettext "blob")" |
| 1150 | submodule="$(gettext "submodule")" |
Ping Yin | 1cb639e | 2008-03-11 21:52:16 +0800 | [diff] [blame] | 1151 | if test $mod_dst = 160000 |
| 1152 | then |
John Keeping | 091a6eb | 2013-06-16 15:18:18 +0100 | [diff] [blame] | 1153 | echo "* $display_name $sha1_abbr_src($blob)->$sha1_abbr_dst($submodule)$total_commits:" |
Ping Yin | 1cb639e | 2008-03-11 21:52:16 +0800 | [diff] [blame] | 1154 | else |
John Keeping | 091a6eb | 2013-06-16 15:18:18 +0100 | [diff] [blame] | 1155 | echo "* $display_name $sha1_abbr_src($submodule)->$sha1_abbr_dst($blob)$total_commits:" |
Ping Yin | 1cb639e | 2008-03-11 21:52:16 +0800 | [diff] [blame] | 1156 | fi |
| 1157 | else |
John Keeping | 091a6eb | 2013-06-16 15:18:18 +0100 | [diff] [blame] | 1158 | echo "* $display_name $sha1_abbr_src...$sha1_abbr_dst$total_commits:" |
Ping Yin | 1cb639e | 2008-03-11 21:52:16 +0800 | [diff] [blame] | 1159 | fi |
| 1160 | if test -n "$errmsg" |
| 1161 | then |
| 1162 | # Don't give error msg for modification whose dst is not submodule |
| 1163 | # i.e. deleted or changed to blob |
| 1164 | test $mod_dst = 160000 && echo "$errmsg" |
| 1165 | else |
Elia Pinto | 496eeeb | 2014-06-10 05:28:33 -0700 | [diff] [blame] | 1166 | if test $mod_src = 160000 && test $mod_dst = 160000 |
Ping Yin | 1cb639e | 2008-03-11 21:52:16 +0800 | [diff] [blame] | 1167 | then |
Ping Yin | f2dc06a | 2008-03-11 21:52:17 +0800 | [diff] [blame] | 1168 | limit= |
| 1169 | test $summary_limit -gt 0 && limit="-$summary_limit" |
Ping Yin | 1cb639e | 2008-03-11 21:52:16 +0800 | [diff] [blame] | 1170 | GIT_DIR="$name/.git" \ |
Ping Yin | f2dc06a | 2008-03-11 21:52:17 +0800 | [diff] [blame] | 1171 | git log $limit --pretty='format: %m %s' \ |
Ping Yin | 1cb639e | 2008-03-11 21:52:16 +0800 | [diff] [blame] | 1172 | --first-parent $sha1_src...$sha1_dst |
| 1173 | elif test $mod_dst = 160000 |
| 1174 | then |
| 1175 | GIT_DIR="$name/.git" \ |
| 1176 | git log --pretty='format: > %s' -1 $sha1_dst |
| 1177 | else |
| 1178 | GIT_DIR="$name/.git" \ |
| 1179 | git log --pretty='format: < %s' -1 $sha1_src |
| 1180 | fi |
| 1181 | echo |
| 1182 | fi |
| 1183 | echo |
Matthieu Moy | 3ba7407 | 2013-09-06 19:43:06 +0200 | [diff] [blame] | 1184 | done |
Ping Yin | 28f9af5 | 2008-03-11 21:52:15 +0800 | [diff] [blame] | 1185 | } |
Lars Hjemli | 70c7ac2 | 2007-05-26 15:56:40 +0200 | [diff] [blame] | 1186 | # |
Lars Hjemli | 941987a | 2007-06-11 21:12:24 +0200 | [diff] [blame] | 1187 | # List all submodules, prefixed with: |
Lars Hjemli | 70c7ac2 | 2007-05-26 15:56:40 +0200 | [diff] [blame] | 1188 | # - submodule not initialized |
| 1189 | # + different revision checked out |
| 1190 | # |
| 1191 | # If --cached was specified the revision in the index will be printed |
| 1192 | # instead of the currently checked out revision. |
| 1193 | # |
| 1194 | # $@ = requested paths (default to all) |
| 1195 | # |
Junio C Hamano | 23a485e | 2008-01-15 02:35:49 -0800 | [diff] [blame] | 1196 | cmd_status() |
Lars Hjemli | 70c7ac2 | 2007-05-26 15:56:40 +0200 | [diff] [blame] | 1197 | { |
Junio C Hamano | 5c08dbb | 2008-01-15 02:48:45 -0800 | [diff] [blame] | 1198 | # parse $args after "submodule ... status". |
| 1199 | while test $# -ne 0 |
| 1200 | do |
| 1201 | case "$1" in |
| 1202 | -q|--quiet) |
Stephen Boyd | 2e6a30e | 2009-06-16 15:33:00 -0700 | [diff] [blame] | 1203 | GIT_QUIET=1 |
Junio C Hamano | 5c08dbb | 2008-01-15 02:48:45 -0800 | [diff] [blame] | 1204 | ;; |
| 1205 | --cached) |
| 1206 | cached=1 |
| 1207 | ;; |
Johan Herland | 64b19ff | 2009-08-19 03:45:24 +0200 | [diff] [blame] | 1208 | --recursive) |
| 1209 | recursive=1 |
| 1210 | ;; |
Junio C Hamano | 5c08dbb | 2008-01-15 02:48:45 -0800 | [diff] [blame] | 1211 | --) |
| 1212 | shift |
| 1213 | break |
| 1214 | ;; |
| 1215 | -*) |
| 1216 | usage |
| 1217 | ;; |
| 1218 | *) |
| 1219 | break |
| 1220 | ;; |
| 1221 | esac |
| 1222 | shift |
| 1223 | done |
| 1224 | |
David Aguilar | a7b3269 | 2008-08-22 00:30:50 -0700 | [diff] [blame] | 1225 | module_list "$@" | |
Ramsay Jones | 64394e3 | 2012-04-17 19:00:58 +0100 | [diff] [blame] | 1226 | while read mode sha1 stage sm_path |
Lars Hjemli | 70c7ac2 | 2007-05-26 15:56:40 +0200 | [diff] [blame] | 1227 | do |
Heiko Voigt | be9d0a3 | 2012-08-14 22:35:27 +0200 | [diff] [blame] | 1228 | die_if_unmatched "$mode" |
Ramsay Jones | 64394e3 | 2012-04-17 19:00:58 +0100 | [diff] [blame] | 1229 | name=$(module_name "$sm_path") || exit |
Junio C Hamano | 5be6007 | 2007-07-02 22:52:14 -0700 | [diff] [blame] | 1230 | url=$(git config submodule."$name".url) |
John Keeping | 091a6eb | 2013-06-16 15:18:18 +0100 | [diff] [blame] | 1231 | displaypath=$(relative_path "$prefix$sm_path") |
Nicolas Morey-Chaisemartin | 313ee0d | 2011-03-30 07:20:02 +0200 | [diff] [blame] | 1232 | if test "$stage" = U |
| 1233 | then |
| 1234 | say "U$sha1 $displaypath" |
| 1235 | continue |
| 1236 | fi |
Elia Pinto | 496eeeb | 2014-06-10 05:28:33 -0700 | [diff] [blame] | 1237 | if test -z "$url" || |
| 1238 | { |
| 1239 | ! test -d "$sm_path"/.git && |
| 1240 | ! test -f "$sm_path"/.git |
| 1241 | } |
Lars Hjemli | 70c7ac2 | 2007-05-26 15:56:40 +0200 | [diff] [blame] | 1242 | then |
Johan Herland | 64b19ff | 2009-08-19 03:45:24 +0200 | [diff] [blame] | 1243 | say "-$sha1 $displaypath" |
Lars Hjemli | 70c7ac2 | 2007-05-26 15:56:40 +0200 | [diff] [blame] | 1244 | continue; |
| 1245 | fi |
Ramsay Jones | 64394e3 | 2012-04-17 19:00:58 +0100 | [diff] [blame] | 1246 | if git diff-files --ignore-submodules=dirty --quiet -- "$sm_path" |
Lars Hjemli | 70c7ac2 | 2007-05-26 15:56:40 +0200 | [diff] [blame] | 1247 | then |
Fredrik Gustafsson | b545cd1 | 2013-06-17 11:55:36 +0200 | [diff] [blame] | 1248 | set_name_rev "$sm_path" "$sha1" |
Johan Herland | 64b19ff | 2009-08-19 03:45:24 +0200 | [diff] [blame] | 1249 | say " $sha1 $displaypath$revname" |
Lars Hjemli | 70c7ac2 | 2007-05-26 15:56:40 +0200 | [diff] [blame] | 1250 | else |
| 1251 | if test -z "$cached" |
| 1252 | then |
Ramsay Jones | 64394e3 | 2012-04-17 19:00:58 +0100 | [diff] [blame] | 1253 | sha1=$(clear_local_git_env; cd "$sm_path" && git rev-parse --verify HEAD) |
Lars Hjemli | 70c7ac2 | 2007-05-26 15:56:40 +0200 | [diff] [blame] | 1254 | fi |
Fredrik Gustafsson | b545cd1 | 2013-06-17 11:55:36 +0200 | [diff] [blame] | 1255 | set_name_rev "$sm_path" "$sha1" |
Johan Herland | 64b19ff | 2009-08-19 03:45:24 +0200 | [diff] [blame] | 1256 | say "+$sha1 $displaypath$revname" |
| 1257 | fi |
| 1258 | |
| 1259 | if test -n "$recursive" |
| 1260 | then |
| 1261 | ( |
| 1262 | prefix="$displaypath/" |
Giuseppe Bilotta | 74ae141 | 2010-02-25 00:34:17 +0100 | [diff] [blame] | 1263 | clear_local_git_env |
Ramsay Jones | 64394e3 | 2012-04-17 19:00:58 +0100 | [diff] [blame] | 1264 | cd "$sm_path" && |
Jens Lehmann | e15bec0 | 2012-10-28 22:37:16 +0100 | [diff] [blame] | 1265 | eval cmd_status |
Johan Herland | 64b19ff | 2009-08-19 03:45:24 +0200 | [diff] [blame] | 1266 | ) || |
Ramsay Jones | 64394e3 | 2012-04-17 19:00:58 +0100 | [diff] [blame] | 1267 | die "$(eval_gettext "Failed to recurse into submodule path '\$sm_path'")" |
Lars Hjemli | 70c7ac2 | 2007-05-26 15:56:40 +0200 | [diff] [blame] | 1268 | fi |
| 1269 | done |
| 1270 | } |
David Aguilar | 2327f61 | 2008-08-24 12:43:37 -0700 | [diff] [blame] | 1271 | # |
| 1272 | # Sync remote urls for submodules |
| 1273 | # This makes the value for remote.$remote.url match the value |
| 1274 | # specified in .gitmodules. |
| 1275 | # |
| 1276 | cmd_sync() |
| 1277 | { |
| 1278 | while test $# -ne 0 |
| 1279 | do |
| 1280 | case "$1" in |
| 1281 | -q|--quiet) |
Stephen Boyd | 2e6a30e | 2009-06-16 15:33:00 -0700 | [diff] [blame] | 1282 | GIT_QUIET=1 |
David Aguilar | 2327f61 | 2008-08-24 12:43:37 -0700 | [diff] [blame] | 1283 | shift |
| 1284 | ;; |
Phil Hord | 82f49f2 | 2012-10-26 15:44:42 -0400 | [diff] [blame] | 1285 | --recursive) |
| 1286 | recursive=1 |
| 1287 | shift |
| 1288 | ;; |
David Aguilar | 2327f61 | 2008-08-24 12:43:37 -0700 | [diff] [blame] | 1289 | --) |
| 1290 | shift |
| 1291 | break |
| 1292 | ;; |
| 1293 | -*) |
| 1294 | usage |
| 1295 | ;; |
| 1296 | *) |
| 1297 | break |
| 1298 | ;; |
| 1299 | esac |
| 1300 | done |
| 1301 | cd_to_toplevel |
| 1302 | module_list "$@" | |
Ramsay Jones | 64394e3 | 2012-04-17 19:00:58 +0100 | [diff] [blame] | 1303 | while read mode sha1 stage sm_path |
David Aguilar | 2327f61 | 2008-08-24 12:43:37 -0700 | [diff] [blame] | 1304 | do |
Heiko Voigt | be9d0a3 | 2012-08-14 22:35:27 +0200 | [diff] [blame] | 1305 | die_if_unmatched "$mode" |
Ramsay Jones | 64394e3 | 2012-04-17 19:00:58 +0100 | [diff] [blame] | 1306 | name=$(module_name "$sm_path") |
David Aguilar | 2327f61 | 2008-08-24 12:43:37 -0700 | [diff] [blame] | 1307 | url=$(git config -f .gitmodules --get submodule."$name".url) |
Johan Herland | baede9f | 2008-09-22 18:08:31 +0200 | [diff] [blame] | 1308 | |
| 1309 | # Possibly a url relative to parent |
| 1310 | case "$url" in |
| 1311 | ./*|../*) |
Jon Seymour | 967b2c6 | 2012-06-06 21:57:29 +1000 | [diff] [blame] | 1312 | # rewrite foo/bar as ../.. to find path from |
| 1313 | # submodule work tree to superproject work tree |
Junio C Hamano | 6a06623 | 2014-06-10 08:33:39 -0700 | [diff] [blame] | 1314 | up_path="$(printf '%s\n' "$sm_path" | sed "s/[^/][^/]*/../g")" && |
Jon Seymour | 967b2c6 | 2012-06-06 21:57:29 +1000 | [diff] [blame] | 1315 | # guarantee a trailing / |
| 1316 | up_path=${up_path%/}/ && |
| 1317 | # path from submodule work tree to submodule origin repo |
| 1318 | sub_origin_url=$(resolve_relative_url "$url" "$up_path") && |
| 1319 | # path from superproject work tree to submodule origin repo |
| 1320 | super_config_url=$(resolve_relative_url "$url") || exit |
| 1321 | ;; |
| 1322 | *) |
| 1323 | sub_origin_url="$url" |
| 1324 | super_config_url="$url" |
Johan Herland | baede9f | 2008-09-22 18:08:31 +0200 | [diff] [blame] | 1325 | ;; |
| 1326 | esac |
| 1327 | |
Junio C Hamano | ccee608 | 2011-06-25 22:41:25 +0200 | [diff] [blame] | 1328 | if git config "submodule.$name.url" >/dev/null 2>/dev/null |
David Aguilar | 2327f61 | 2008-08-24 12:43:37 -0700 | [diff] [blame] | 1329 | then |
John Keeping | 091a6eb | 2013-06-16 15:18:18 +0100 | [diff] [blame] | 1330 | displaypath=$(relative_path "$prefix$sm_path") |
| 1331 | say "$(eval_gettext "Synchronizing submodule url for '\$displaypath'")" |
Jon Seymour | 967b2c6 | 2012-06-06 21:57:29 +1000 | [diff] [blame] | 1332 | git config submodule."$name".url "$super_config_url" |
Junio C Hamano | ccee608 | 2011-06-25 22:41:25 +0200 | [diff] [blame] | 1333 | |
Ramsay Jones | 64394e3 | 2012-04-17 19:00:58 +0100 | [diff] [blame] | 1334 | if test -e "$sm_path"/.git |
Junio C Hamano | ccee608 | 2011-06-25 22:41:25 +0200 | [diff] [blame] | 1335 | then |
| 1336 | ( |
| 1337 | clear_local_git_env |
Ramsay Jones | 64394e3 | 2012-04-17 19:00:58 +0100 | [diff] [blame] | 1338 | cd "$sm_path" |
Junio C Hamano | ccee608 | 2011-06-25 22:41:25 +0200 | [diff] [blame] | 1339 | remote=$(get_default_remote) |
Jon Seymour | 967b2c6 | 2012-06-06 21:57:29 +1000 | [diff] [blame] | 1340 | git config remote."$remote".url "$sub_origin_url" |
Phil Hord | 82f49f2 | 2012-10-26 15:44:42 -0400 | [diff] [blame] | 1341 | |
| 1342 | if test -n "$recursive" |
| 1343 | then |
| 1344 | prefix="$prefix$sm_path/" |
| 1345 | eval cmd_sync |
| 1346 | fi |
Junio C Hamano | ccee608 | 2011-06-25 22:41:25 +0200 | [diff] [blame] | 1347 | ) |
| 1348 | fi |
David Aguilar | 2327f61 | 2008-08-24 12:43:37 -0700 | [diff] [blame] | 1349 | fi |
| 1350 | done |
| 1351 | } |
Lars Hjemli | 70c7ac2 | 2007-05-26 15:56:40 +0200 | [diff] [blame] | 1352 | |
Junio C Hamano | 5c08dbb | 2008-01-15 02:48:45 -0800 | [diff] [blame] | 1353 | # This loop parses the command line arguments to find the |
| 1354 | # subcommand name to dispatch. Parsing of the subcommand specific |
| 1355 | # options are primarily done by the subcommand implementations. |
| 1356 | # Subcommand specific options such as --branch and --cached are |
| 1357 | # parsed here as well, for backward compatibility. |
| 1358 | |
| 1359 | while test $# != 0 && test -z "$command" |
Lars Hjemli | 70c7ac2 | 2007-05-26 15:56:40 +0200 | [diff] [blame] | 1360 | do |
| 1361 | case "$1" in |
Jens Lehmann | cf41982 | 2013-03-04 22:20:24 +0100 | [diff] [blame] | 1362 | add | foreach | init | deinit | update | status | summary | sync) |
Junio C Hamano | 5c08dbb | 2008-01-15 02:48:45 -0800 | [diff] [blame] | 1363 | command=$1 |
Lars Hjemli | 70c7ac2 | 2007-05-26 15:56:40 +0200 | [diff] [blame] | 1364 | ;; |
| 1365 | -q|--quiet) |
Stephen Boyd | 2e6a30e | 2009-06-16 15:33:00 -0700 | [diff] [blame] | 1366 | GIT_QUIET=1 |
Lars Hjemli | 70c7ac2 | 2007-05-26 15:56:40 +0200 | [diff] [blame] | 1367 | ;; |
Sven Verdoolaege | ecda072 | 2007-06-24 23:06:07 +0200 | [diff] [blame] | 1368 | -b|--branch) |
| 1369 | case "$2" in |
| 1370 | '') |
| 1371 | usage |
| 1372 | ;; |
| 1373 | esac |
| 1374 | branch="$2"; shift |
| 1375 | ;; |
Lars Hjemli | 70c7ac2 | 2007-05-26 15:56:40 +0200 | [diff] [blame] | 1376 | --cached) |
Ping Yin | 28f9af5 | 2008-03-11 21:52:15 +0800 | [diff] [blame] | 1377 | cached="$1" |
Lars Hjemli | 70c7ac2 | 2007-05-26 15:56:40 +0200 | [diff] [blame] | 1378 | ;; |
| 1379 | --) |
| 1380 | break |
| 1381 | ;; |
| 1382 | -*) |
| 1383 | usage |
| 1384 | ;; |
| 1385 | *) |
| 1386 | break |
| 1387 | ;; |
| 1388 | esac |
| 1389 | shift |
| 1390 | done |
| 1391 | |
Junio C Hamano | 5c08dbb | 2008-01-15 02:48:45 -0800 | [diff] [blame] | 1392 | # No command word defaults to "status" |
Ramkumar Ramachandra | af9c9f9 | 2012-09-22 16:57:59 +0530 | [diff] [blame] | 1393 | if test -z "$command" |
| 1394 | then |
| 1395 | if test $# = 0 |
| 1396 | then |
| 1397 | command=status |
| 1398 | else |
| 1399 | usage |
| 1400 | fi |
| 1401 | fi |
Sven Verdoolaege | ecda072 | 2007-06-24 23:06:07 +0200 | [diff] [blame] | 1402 | |
Junio C Hamano | 5c08dbb | 2008-01-15 02:48:45 -0800 | [diff] [blame] | 1403 | # "-b branch" is accepted only by "add" |
| 1404 | if test -n "$branch" && test "$command" != add |
| 1405 | then |
Lars Hjemli | 70c7ac2 | 2007-05-26 15:56:40 +0200 | [diff] [blame] | 1406 | usage |
Junio C Hamano | 5c08dbb | 2008-01-15 02:48:45 -0800 | [diff] [blame] | 1407 | fi |
| 1408 | |
Ping Yin | 28f9af5 | 2008-03-11 21:52:15 +0800 | [diff] [blame] | 1409 | # "--cached" is accepted only by "status" and "summary" |
Elia Pinto | 496eeeb | 2014-06-10 05:28:33 -0700 | [diff] [blame] | 1410 | if test -n "$cached" && test "$command" != status && test "$command" != summary |
Junio C Hamano | 5c08dbb | 2008-01-15 02:48:45 -0800 | [diff] [blame] | 1411 | then |
| 1412 | usage |
| 1413 | fi |
| 1414 | |
| 1415 | "cmd_$command" "$@" |