Skip to content
Newer
Older
100755 943 lines (879 sloc) 18.5 KB
70c7ac2 @hjemli Add git-submodule command
hjemli authored May 26, 2007
1 #!/bin/sh
2 #
ecda072 git-submodule: provide easy way of adding new submodules
Sven Verdoolaege authored Jun 24, 2007
3 # git-submodules.sh: add, init, update or list git submodules
70c7ac2 @hjemli Add git-submodule command
hjemli authored May 26, 2007
4 #
5 # Copyright (c) 2007 Lars Hjemli
6
1d5bec8 @jherland git submodule: Cleanup usage string and add option parsing to cmd_for…
jherland authored Aug 19, 2009
7 dashless=$(basename "$0" | sed -e 's/-/ /')
d27b876 @jlehmann git submodule add: Require the new --force option to add ignored paths
jlehmann authored Jul 17, 2010
8 USAGE="[--quiet] add [-b branch] [-f|--force] [--reference <repository>] [--] <repository> [<path>]
64b19ff @jherland git submodule status: Add --recursive to recurse into nested submodules
jherland authored Aug 19, 2009
9 or: $dashless [--quiet] status [--cached] [--recursive] [--] [<path>...]
1d5bec8 @jherland git submodule: Cleanup usage string and add option parsing to cmd_for…
jherland authored Aug 19, 2009
10 or: $dashless [--quiet] init [--] [<path>...]
b13fd5c @jherland git submodule update: Introduce --recursive to update nested submodules
jherland authored Aug 19, 2009
11 or: $dashless [--quiet] update [--init] [-N|--no-fetch] [--rebase] [--reference <repository>] [--merge] [--recursive] [--] [<path>...]
adc5423 @gitster Merge branch 'jh/submodule-foreach'
gitster authored Aug 27, 2009
12 or: $dashless [--quiet] summary [--cached|--files] [--summary-limit <n>] [commit] [--] [<path>...]
15fc56a @jherland git submodule foreach: Add --recursive to recurse into nested submodules
jherland authored Aug 19, 2009
13 or: $dashless [--quiet] foreach [--recursive] <command>
1d5bec8 @jherland git submodule: Cleanup usage string and add option parsing to cmd_for…
jherland authored Aug 19, 2009
14 or: $dashless [--quiet] sync [--] [<path>...]"
8f321a3 @gitster scripts: Add placeholders for OPTIONS_SPEC
gitster authored Nov 6, 2007
15 OPTIONS_SPEC=
70c7ac2 @hjemli Add git-submodule command
hjemli authored May 26, 2007
16 . git-sh-setup
98fcf84 @mark987 git-submodule - Use "get_default_remote" from git-parse-remote
mark987 authored Aug 24, 2008
17 . git-parse-remote
70c7ac2 @hjemli Add git-submodule command
hjemli authored May 26, 2007
18 require_work_tree
19
5c08dbb @gitster git-submodule: fix subcommand parser
gitster authored Jan 15, 2008
20 command=
ecda072 git-submodule: provide easy way of adding new submodules
Sven Verdoolaege authored Jun 24, 2007
21 branch=
d27b876 @jlehmann git submodule add: Require the new --force option to add ignored paths
jlehmann authored Jul 17, 2010
22 force=
d92a395 @mstsirkin Add --reference option to git submodule.
mstsirkin authored May 4, 2009
23 reference=
70c7ac2 @hjemli Add git-submodule command
hjemli authored May 26, 2007
24 cached=
48bb303 git-submodule.sh: properly initialize shell variables
Gerrit Pape authored Apr 26, 2010
25 recursive=
26 init=
1c244f6 @jlehmann git submodule summary: add --files option
jlehmann authored Aug 13, 2009
27 files=
31ca3ac @Fabianx submodule: add --no-fetch parameter to update command
Fabianx authored Feb 5, 2009
28 nofetch=
3294842 @jherland Rename submodule.<name>.rebase to submodule.<name>.update
jherland authored Jun 3, 2009
29 update=
15fc56a @jherland git submodule foreach: Add --recursive to recurse into nested submodules
jherland authored Aug 19, 2009
30 prefix=
70c7ac2 @hjemli Add git-submodule command
hjemli authored May 26, 2007
31
f31a522 @mark987 git-submodule - allow a relative path as the subproject url
mark987 authored Sep 23, 2007
32 # Resolve relative url by appending to parent's url
33 resolve_relative_url ()
34 {
98fcf84 @mark987 git-submodule - Use "get_default_remote" from git-parse-remote
mark987 authored Aug 24, 2008
35 remote=$(get_default_remote)
8e7e6f3 @mark987 git-submodule - Fix errors regarding resolve_relative_url
mark987 authored Jun 14, 2008
36 remoteurl=$(git config "remote.$remote.url") ||
37 die "remote ($remote) does not have a url defined in .git/config"
f31a522 @mark987 git-submodule - allow a relative path as the subproject url
mark987 authored Sep 24, 2007
38 url="$1"
99b120a @mark987 git-submodule.sh - Remove trailing / from URL if found
mark987 authored Aug 21, 2008
39 remoteurl=${remoteurl%/}
ea640cc @trast submodule: fix relative url parsing for scp-style origin
trast authored Jan 10, 2011
40 sep=/
f31a522 @mark987 git-submodule - allow a relative path as the subproject url
mark987 authored Sep 24, 2007
41 while test -n "$url"
42 do
43 case "$url" in
44 ../*)
45 url="${url#../}"
ea640cc @trast submodule: fix relative url parsing for scp-style origin
trast authored Jan 10, 2011
46 case "$remoteurl" in
47 */*)
48 remoteurl="${remoteurl%/*}"
49 ;;
50 *:*)
51 remoteurl="${remoteurl%:*}"
52 sep=:
53 ;;
54 *)
55 die "cannot strip one component off url '$remoteurl'"
56 ;;
57 esac
f31a522 @mark987 git-submodule - allow a relative path as the subproject url
mark987 authored Sep 24, 2007
58 ;;
59 ./*)
60 url="${url#./}"
61 ;;
62 *)
63 break;;
64 esac
65 done
ea640cc @trast submodule: fix relative url parsing for scp-style origin
trast authored Jan 10, 2011
66 echo "$remoteurl$sep${url%/}"
f31a522 @mark987 git-submodule - allow a relative path as the subproject url
mark987 authored Sep 24, 2007
67 }
68
941987a @hjemli git-submodule: give submodules proper names
hjemli authored Jun 11, 2007
69 #
a7b3269 @davvid git-submodule: replace duplicated code with a module_list function
davvid authored Aug 22, 2008
70 # Get submodule info for registered submodules
71 # $@ = path to limit submodule list
72 #
73 module_list()
74 {
313ee0d submodule: process conflicting submodules only once
Nicolas Morey-Chaisemartin authored Mar 30, 2011
75 git ls-files --error-unmatch --stage -- "$@" |
76 perl -e '
77 my %unmerged = ();
78 my ($null_sha1) = ("0" x 40);
79 while (<STDIN>) {
80 chomp;
81 my ($mode, $sha1, $stage, $path) =
82 /^([0-7]+) ([0-9a-f]{40}) ([0-3])\t(.*)$/;
83 next unless $mode eq "160000";
84 if ($stage ne "0") {
85 if (!$unmerged{$path}++) {
86 print "$mode $null_sha1 U\t$path\n";
87 }
88 next;
89 }
90 print "$_\n";
91 }
92 '
a7b3269 @davvid git-submodule: replace duplicated code with a module_list function
davvid authored Aug 22, 2008
93 }
94
95 #
941987a @hjemli git-submodule: give submodules proper names
hjemli authored Jun 11, 2007
96 # Map submodule path to submodule name
97 #
98 # $1 = path
99 #
100 module_name()
101 {
537601a @gitster git-submodule module_name: avoid using unwieldy "value_regexp" feature.
gitster authored Jul 25, 2007
102 # Do we have "submodule.<something>.path = $1" defined in .gitmodules file?
fe22e54 Improve sed portability
Chris Ridd authored Jun 11, 2008
103 re=$(printf '%s\n' "$1" | sed -e 's/[].[^$\\*]/\\&/g')
a5099bb @imyousuf Use '-f' option to point to the .gitmodules file
imyousuf authored May 15, 2008
104 name=$( git config -f .gitmodules --get-regexp '^submodule\..*\.path$' |
537601a @gitster git-submodule module_name: avoid using unwieldy "value_regexp" feature.
gitster authored Jul 25, 2007
105 sed -n -e 's|^submodule\.\(.*\)\.path '"$re"'$|\1|p' )
941987a @hjemli git-submodule: give submodules proper names
hjemli authored Jun 11, 2007
106 test -z "$name" &&
107 die "No submodule mapping found in .gitmodules for path '$path'"
108 echo "$name"
109 }
33aa6ff @hjemli git-submodule: move cloning into a separate function
hjemli authored Jun 6, 2007
110
111 #
112 # Clone a submodule
113 #
23a485e @gitster git-submodule: rename shell functions for consistency
gitster authored Jan 15, 2008
114 # Prior to calling, cmd_update checks that a possibly existing
ecda072 git-submodule: provide easy way of adding new submodules
Sven Verdoolaege authored Jun 24, 2007
115 # path is not a git repository.
23a485e @gitster git-submodule: rename shell functions for consistency
gitster authored Jan 15, 2008
116 # Likewise, cmd_add checks that path does not exist at all,
ecda072 git-submodule: provide easy way of adding new submodules
Sven Verdoolaege authored Jun 24, 2007
117 # since it is the location of a new submodule.
118 #
33aa6ff @hjemli git-submodule: move cloning into a separate function
hjemli authored Jun 6, 2007
119 module_clone()
120 {
121 path=$1
122 url=$2
d92a395 @mstsirkin Add --reference option to git submodule.
mstsirkin authored May 4, 2009
123 reference="$3"
33aa6ff @hjemli git-submodule: move cloning into a separate function
hjemli authored Jun 6, 2007
124
d92a395 @mstsirkin Add --reference option to git submodule.
mstsirkin authored May 4, 2009
125 if test -n "$reference"
126 then
127 git-clone "$reference" -n "$url" "$path"
128 else
129 git-clone -n "$url" "$path"
130 fi ||
941987a @hjemli git-submodule: give submodules proper names
hjemli authored Jun 11, 2007
131 die "Clone of '$url' into submodule path '$path' failed"
33aa6ff @hjemli git-submodule: move cloning into a separate function
hjemli authored Jun 6, 2007
132 }
133
70c7ac2 @hjemli Add git-submodule command
hjemli authored May 26, 2007
134 #
ecda072 git-submodule: provide easy way of adding new submodules
Sven Verdoolaege authored Jun 24, 2007
135 # Add a new submodule to the working tree, .gitmodules and the index
136 #
ec05df3 @mark987 git-submodule - make "submodule add" more strict, and document it
mark987 authored Jul 9, 2008
137 # $@ = repo path
ecda072 git-submodule: provide easy way of adding new submodules
Sven Verdoolaege authored Jun 24, 2007
138 #
139 # optional branch is stored in global branch variable
140 #
23a485e @gitster git-submodule: rename shell functions for consistency
gitster authored Jan 15, 2008
141 cmd_add()
ecda072 git-submodule: provide easy way of adding new submodules
Sven Verdoolaege authored Jun 24, 2007
142 {
5c08dbb @gitster git-submodule: fix subcommand parser
gitster authored Jan 15, 2008
143 # parse $args after "submodule ... add".
144 while test $# -ne 0
145 do
146 case "$1" in
147 -b | --branch)
148 case "$2" in '') usage ;; esac
149 branch=$2
150 shift
151 ;;
d27b876 @jlehmann git submodule add: Require the new --force option to add ignored paths
jlehmann authored Jul 17, 2010
152 -f | --force)
153 force=$1
154 ;;
5c08dbb @gitster git-submodule: fix subcommand parser
gitster authored Jan 15, 2008
155 -q|--quiet)
2e6a30e @bebarino submodule, repack: migrate to git-sh-setup's say()
bebarino authored Jun 16, 2009
156 GIT_QUIET=1
5c08dbb @gitster git-submodule: fix subcommand parser
gitster authored Jan 15, 2008
157 ;;
d92a395 @mstsirkin Add --reference option to git submodule.
mstsirkin authored May 4, 2009
158 --reference)
159 case "$2" in '') usage ;; esac
160 reference="--reference=$2"
161 shift
162 ;;
163 --reference=*)
164 reference="$1"
165 shift
166 ;;
5c08dbb @gitster git-submodule: fix subcommand parser
gitster authored Jan 15, 2008
167 --)
168 shift
169 break
170 ;;
171 -*)
172 usage
173 ;;
174 *)
175 break
176 ;;
177 esac
178 shift
179 done
180
ecda072 git-submodule: provide easy way of adding new submodules
Sven Verdoolaege authored Jun 24, 2007
181 repo=$1
182 path=$2
183
1414e57 @jlehmann git submodule add: make the <path> parameter optional
jlehmann authored Sep 22, 2009
184 if test -z "$path"; then
185 path=$(echo "$repo" |
186 sed -e 's|/$||' -e 's|:*/*\.git$||' -e 's|.*[/:]||g')
187 fi
188
ec05df3 @mark987 git-submodule - make "submodule add" more strict, and document it
mark987 authored Jul 10, 2008
189 if test -z "$repo" -o -z "$path"; then
ecda072 git-submodule: provide easy way of adding new submodules
Sven Verdoolaege authored Jun 24, 2007
190 usage
191 fi
192
ec05df3 @mark987 git-submodule - make "submodule add" more strict, and document it
mark987 authored Jul 10, 2008
193 # assure repo is absolute or relative to parent
194 case "$repo" in
195 ./*|../*)
196 # dereference source url relative to parent's url
197 realrepo=$(resolve_relative_url "$repo") || exit
198 ;;
199 *:*|/*)
200 # absolute url
201 realrepo=$repo
202 ;;
203 *)
204 die "repo URL: '$repo' must be absolute or begin with ./|../"
205 ;;
206 esac
207
db75ada @mjg git submodule: Fix adding of submodules at paths with ./, .. and //
mjg authored Mar 3, 2009
208 # normalize path:
209 # multiple //; leading ./; /./; /../; trailing /
210 path=$(printf '%s/\n' "$path" |
211 sed -e '
212 s|//*|/|g
213 s|^\(\./\)*||
214 s|/\./|/|g
215 :start
216 s|\([^/]*\)/\.\./||
217 tstart
218 s|/*$||
219 ')
5be6007 @gitster Rewrite "git-frotz" to "git frotz"
gitster authored Jul 2, 2007
220 git ls-files --error-unmatch "$path" > /dev/null 2>&1 &&
ecda072 git-submodule: provide easy way of adding new submodules
Sven Verdoolaege authored Jun 24, 2007
221 die "'$path' already exists in the index"
222
d27b876 @jlehmann git submodule add: Require the new --force option to add ignored paths
jlehmann authored Jul 17, 2010
223 if test -z "$force" && ! git add --dry-run --ignore-missing "$path" > /dev/null 2>&1
224 then
225 echo >&2 "The following path is ignored by one of your .gitignore files:" &&
226 echo >&2 $path &&
227 echo >&2 "Use -f if you really want to add it."
228 exit 1
229 fi
230
d4264ca @mark987 git-submodule - Allow adding a submodule in-place
mark987 authored Mar 4, 2008
231 # perhaps the path exists and is already a git repo, else clone it
232 if test -e "$path"
233 then
e965647 @mark987 git-submodule - Fix bugs in adding an existing repo as a module
mark987 authored Jul 7, 2008
234 if test -d "$path"/.git -o -f "$path"/.git
d4264ca @mark987 git-submodule - Allow adding a submodule in-place
mark987 authored Mar 5, 2008
235 then
236 echo "Adding existing repo at '$path' to the index"
237 else
238 die "'$path' already exists and is not a valid git repo"
239 fi
c2f9391 @mark987 git-submodule - register submodule URL if adding in place
mark987 authored Jul 9, 2008
240
241 case "$repo" in
242 ./*|../*)
243 url=$(resolve_relative_url "$repo") || exit
244 ;;
245 *)
246 url="$repo"
247 ;;
248 esac
249 git config submodule."$path".url "$url"
d4264ca @mark987 git-submodule - Allow adding a submodule in-place
mark987 authored Mar 5, 2008
250 else
251
d92a395 @mstsirkin Add --reference option to git submodule.
mstsirkin authored May 4, 2009
252 module_clone "$path" "$realrepo" "$reference" || exit
ea10b60 @bjj Work around ash "alternate value" expansion bug
bjj authored Apr 18, 2009
253 (
74ae141 @Oblomov submodules: ensure clean environment when operating in a submodule
Oblomov authored Feb 25, 2010
254 clear_local_git_env
ea10b60 @bjj Work around ash "alternate value" expansion bug
bjj authored Apr 19, 2009
255 cd "$path" &&
256 # ash fails to wordsplit ${branch:+-b "$branch"...}
257 case "$branch" in
258 '') git checkout -f -q ;;
502dc5b @jrn git submodule -b ... of current HEAD fails
jrn authored Dec 1, 2010
259 ?*) git checkout -f -q -B "$branch" "origin/$branch" ;;
ea10b60 @bjj Work around ash "alternate value" expansion bug
bjj authored Apr 19, 2009
260 esac
261 ) || die "Unable to checkout submodule '$path'"
d4264ca @mark987 git-submodule - Allow adding a submodule in-place
mark987 authored Mar 5, 2008
262 fi
263
d27b876 @jlehmann git submodule add: Require the new --force option to add ignored paths
jlehmann authored Jul 17, 2010
264 git add $force "$path" ||
ecda072 git-submodule: provide easy way of adding new submodules
Sven Verdoolaege authored Jun 24, 2007
265 die "Failed to add submodule '$path'"
266
a5099bb @imyousuf Use '-f' option to point to the .gitmodules file
imyousuf authored May 15, 2008
267 git config -f .gitmodules submodule."$path".path "$path" &&
268 git config -f .gitmodules submodule."$path".url "$repo" &&
31991b0 @avar git submodule: add submodules with git add -f <path>
avar authored Jul 5, 2010
269 git add --force .gitmodules ||
ecda072 git-submodule: provide easy way of adding new submodules
Sven Verdoolaege authored Jun 24, 2007
270 die "Failed to register submodule '$path'"
271 }
272
273 #
19a31f9 @mark987 git-submodule - Add 'foreach' subcommand
mark987 authored Aug 10, 2008
274 # Execute an arbitrary command sequence in each checked out
275 # submodule
276 #
277 # $@ = command to execute
278 #
279 cmd_foreach()
280 {
1d5bec8 @jherland git submodule: Cleanup usage string and add option parsing to cmd_for…
jherland authored Aug 19, 2009
281 # parse $args after "submodule ... foreach".
282 while test $# -ne 0
283 do
284 case "$1" in
285 -q|--quiet)
286 GIT_QUIET=1
287 ;;
15fc56a @jherland git submodule foreach: Add --recursive to recurse into nested submodules
jherland authored Aug 19, 2009
288 --recursive)
289 recursive=1
290 ;;
1d5bec8 @jherland git submodule: Cleanup usage string and add option parsing to cmd_for…
jherland authored Aug 19, 2009
291 -*)
292 usage
293 ;;
294 *)
295 break
296 ;;
297 esac
298 shift
299 done
300
f030c96 @avar git-submodule foreach: Add $toplevel variable
avar authored May 21, 2010
301 toplevel=$(pwd)
302
a7b3269 @davvid git-submodule: replace duplicated code with a module_list function
davvid authored Aug 22, 2008
303 module_list |
19a31f9 @mark987 git-submodule - Add 'foreach' subcommand
mark987 authored Aug 10, 2008
304 while read mode sha1 stage path
305 do
306 if test -e "$path"/.git
307 then
15fc56a @jherland git submodule foreach: Add --recursive to recurse into nested submodules
jherland authored Aug 19, 2009
308 say "Entering '$prefix$path'"
1e7f2aa @jherland git submodule foreach: Provide access to submodule name, as '$name'
jherland authored Aug 16, 2009
309 name=$(module_name "$path")
15fc56a @jherland git submodule foreach: Add --recursive to recurse into nested submodules
jherland authored Aug 19, 2009
310 (
311 prefix="$prefix$path/"
74ae141 @Oblomov submodules: ensure clean environment when operating in a submodule
Oblomov authored Feb 24, 2010
312 clear_local_git_env
15fc56a @jherland git submodule foreach: Add --recursive to recurse into nested submodules
jherland authored Aug 19, 2009
313 cd "$path" &&
314 eval "$@" &&
315 if test -n "$recursive"
316 then
317 cmd_foreach "--recursive" "$@"
318 fi
319 ) ||
19a31f9 @mark987 git-submodule - Add 'foreach' subcommand
mark987 authored Aug 10, 2008
320 die "Stopping at '$path'; script returned non-zero status."
321 fi
322 done
323 }
324
325 #
211b7f1 @hjemli git-submodule: clone during update, not during init
hjemli authored Jun 6, 2007
326 # Register submodules in .git/config
70c7ac2 @hjemli Add git-submodule command
hjemli authored May 26, 2007
327 #
328 # $@ = requested paths (default to all)
329 #
23a485e @gitster git-submodule: rename shell functions for consistency
gitster authored Jan 15, 2008
330 cmd_init()
70c7ac2 @hjemli Add git-submodule command
hjemli authored May 26, 2007
331 {
5c08dbb @gitster git-submodule: fix subcommand parser
gitster authored Jan 15, 2008
332 # parse $args after "submodule ... init".
333 while test $# -ne 0
334 do
335 case "$1" in
336 -q|--quiet)
2e6a30e @bebarino submodule, repack: migrate to git-sh-setup's say()
bebarino authored Jun 16, 2009
337 GIT_QUIET=1
5c08dbb @gitster git-submodule: fix subcommand parser
gitster authored Jan 15, 2008
338 ;;
339 --)
340 shift
341 break
342 ;;
343 -*)
344 usage
345 ;;
346 *)
347 break
348 ;;
349 esac
350 shift
351 done
352
a7b3269 @davvid git-submodule: replace duplicated code with a module_list function
davvid authored Aug 22, 2008
353 module_list "$@" |
70c7ac2 @hjemli Add git-submodule command
hjemli authored May 26, 2007
354 while read mode sha1 stage path
355 do
211b7f1 @hjemli git-submodule: clone during update, not during init
hjemli authored Jun 6, 2007
356 # Skip already registered paths
941987a @hjemli git-submodule: give submodules proper names
hjemli authored Jun 11, 2007
357 name=$(module_name "$path") || exit
5be6007 @gitster Rewrite "git-frotz" to "git frotz"
gitster authored Jul 3, 2007
358 url=$(git config submodule."$name".url)
211b7f1 @hjemli git-submodule: clone during update, not during init
hjemli authored Jun 6, 2007
359 test -z "$url" || continue
70c7ac2 @hjemli Add git-submodule command
hjemli authored May 26, 2007
360
a5099bb @imyousuf Use '-f' option to point to the .gitmodules file
imyousuf authored May 15, 2008
361 url=$(git config -f .gitmodules submodule."$name".url)
70c7ac2 @hjemli Add git-submodule command
hjemli authored May 26, 2007
362 test -z "$url" &&
941987a @hjemli git-submodule: give submodules proper names
hjemli authored Jun 11, 2007
363 die "No url found for submodule path '$path' in .gitmodules"
70c7ac2 @hjemli Add git-submodule command
hjemli authored May 26, 2007
364
f31a522 @mark987 git-submodule - allow a relative path as the subproject url
mark987 authored Sep 24, 2007
365 # Possibly a url relative to parent
366 case "$url" in
367 ./*|../*)
8e7e6f3 @mark987 git-submodule - Fix errors regarding resolve_relative_url
mark987 authored Jun 14, 2008
368 url=$(resolve_relative_url "$url") || exit
f31a522 @mark987 git-submodule - allow a relative path as the subproject url
mark987 authored Sep 24, 2007
369 ;;
370 esac
371
5be6007 @gitster Rewrite "git-frotz" to "git frotz"
gitster authored Jul 3, 2007
372 git config submodule."$name".url "$url" ||
941987a @hjemli git-submodule: give submodules proper names
hjemli authored Jun 11, 2007
373 die "Failed to register url for submodule path '$path'"
70c7ac2 @hjemli Add git-submodule command
hjemli authored May 26, 2007
374
3294842 @jherland Rename submodule.<name>.rebase to submodule.<name>.update
jherland authored Jun 3, 2009
375 upd="$(git config -f .gitmodules submodule."$name".update)"
376 test -z "$upd" ||
377 git config submodule."$name".update "$upd" ||
378 die "Failed to register update mode for submodule path '$path'"
ca2cedb @whot git-submodule: add support for --rebase.
whot authored Apr 24, 2009
379
941987a @hjemli git-submodule: give submodules proper names
hjemli authored Jun 11, 2007
380 say "Submodule '$name' ($url) registered for path '$path'"
70c7ac2 @hjemli Add git-submodule command
hjemli authored May 26, 2007
381 done
382 }
383
384 #
211b7f1 @hjemli git-submodule: clone during update, not during init
hjemli authored Jun 6, 2007
385 # Update each submodule path to correct revision, using clone and checkout as needed
70c7ac2 @hjemli Add git-submodule command
hjemli authored May 26, 2007
386 #
387 # $@ = requested paths (default to all)
388 #
23a485e @gitster git-submodule: rename shell functions for consistency
gitster authored Jan 15, 2008
389 cmd_update()
70c7ac2 @hjemli Add git-submodule command
hjemli authored May 26, 2007
390 {
5c08dbb @gitster git-submodule: fix subcommand parser
gitster authored Jan 15, 2008
391 # parse $args after "submodule ... update".
98dbe63 @kballard submodule: only preserve flags across recursive status/update invocat…
kballard authored Nov 2, 2010
392 orig_flags=
5c08dbb @gitster git-submodule: fix subcommand parser
gitster authored Jan 15, 2008
393 while test $# -ne 0
394 do
395 case "$1" in
396 -q|--quiet)
2e6a30e @bebarino submodule, repack: migrate to git-sh-setup's say()
bebarino authored Jun 16, 2009
397 GIT_QUIET=1
5c08dbb @gitster git-submodule: fix subcommand parser
gitster authored Jan 15, 2008
398 ;;
be4d2c8 @dscho submodule update: add convenience option --init
dscho authored May 16, 2008
399 -i|--init)
d92a395 @mstsirkin Add --reference option to git submodule.
mstsirkin authored May 4, 2009
400 init=1
be4d2c8 @dscho submodule update: add convenience option --init
dscho authored May 16, 2008
401 ;;
31ca3ac @Fabianx submodule: add --no-fetch parameter to update command
Fabianx authored Feb 5, 2009
402 -N|--no-fetch)
403 nofetch=1
404 ;;
ca2cedb @whot git-submodule: add support for --rebase.
whot authored Apr 23, 2009
405 -r|--rebase)
3294842 @jherland Rename submodule.<name>.rebase to submodule.<name>.update
jherland authored Jun 3, 2009
406 update="rebase"
ca2cedb @whot git-submodule: add support for --rebase.
whot authored Apr 23, 2009
407 ;;
d92a395 @mstsirkin Add --reference option to git submodule.
mstsirkin authored May 4, 2009
408 --reference)
409 case "$2" in '') usage ;; esac
410 reference="--reference=$2"
98dbe63 @kballard submodule: only preserve flags across recursive status/update invocat…
kballard authored Nov 3, 2010
411 orig_flags="$orig_flags $(git rev-parse --sq-quote "$1")"
412 shift
d92a395 @mstsirkin Add --reference option to git submodule.
mstsirkin authored May 4, 2009
413 ;;
414 --reference=*)
415 reference="$1"
416 ;;
42b4917 @jherland git-submodule: add support for --merge.
jherland authored Jun 3, 2009
417 -m|--merge)
418 update="merge"
419 ;;
b13fd5c @jherland git submodule update: Introduce --recursive to update nested submodules
jherland authored Aug 19, 2009
420 --recursive)
421 recursive=1
422 ;;
5c08dbb @gitster git-submodule: fix subcommand parser
gitster authored Jan 15, 2008
423 --)
424 shift
425 break
426 ;;
427 -*)
428 usage
429 ;;
430 *)
431 break
432 ;;
433 esac
98dbe63 @kballard submodule: only preserve flags across recursive status/update invocat…
kballard authored Nov 3, 2010
434 orig_flags="$orig_flags $(git rev-parse --sq-quote "$1")"
435 shift
5c08dbb @gitster git-submodule: fix subcommand parser
gitster authored Jan 15, 2008
436 done
437
d92a395 @mstsirkin Add --reference option to git submodule.
mstsirkin authored May 4, 2009
438 if test -n "$init"
439 then
440 cmd_init "--" "$@" || return
441 fi
442
1b4735d @olsonse submodule: no [--merge|--rebase] when newly cloned
olsonse authored Feb 17, 2011
443 cloned_modules=
a7b3269 @davvid git-submodule: replace duplicated code with a module_list function
davvid authored Aug 22, 2008
444 module_list "$@" |
70c7ac2 @hjemli Add git-submodule command
hjemli authored May 26, 2007
445 while read mode sha1 stage path
446 do
313ee0d submodule: process conflicting submodules only once
Nicolas Morey-Chaisemartin authored Mar 30, 2011
447 if test "$stage" = U
448 then
449 echo >&2 "Skipping unmerged submodule $path"
450 continue
451 fi
941987a @hjemli git-submodule: give submodules proper names
hjemli authored Jun 11, 2007
452 name=$(module_name "$path") || exit
5be6007 @gitster Rewrite "git-frotz" to "git frotz"
gitster authored Jul 3, 2007
453 url=$(git config submodule."$name".url)
3294842 @jherland Rename submodule.<name>.rebase to submodule.<name>.update
jherland authored Jun 3, 2009
454 update_module=$(git config submodule."$name".update)
211b7f1 @hjemli git-submodule: clone during update, not during init
hjemli authored Jun 6, 2007
455 if test -z "$url"
70c7ac2 @hjemli Add git-submodule command
hjemli authored May 26, 2007
456 then
457 # Only mention uninitialized submodules when its
458 # path have been specified
459 test "$#" != "0" &&
989206f @julliard git-submodule: Avoid printing a spurious message.
julliard authored Nov 11, 2008
460 say "Submodule path '$path' not initialized" &&
be4d2c8 @dscho submodule update: add convenience option --init
dscho authored May 16, 2008
461 say "Maybe you want to use 'update --init'?"
211b7f1 @hjemli git-submodule: clone during update, not during init
hjemli authored Jun 6, 2007
462 continue
463 fi
464
ba88a1f @hjemli Teach git-submodule.sh about the .git file
hjemli authored Feb 20, 2008
465 if ! test -d "$path"/.git -o -f "$path"/.git
211b7f1 @hjemli git-submodule: clone during update, not during init
hjemli authored Jun 6, 2007
466 then
d92a395 @mstsirkin Add --reference option to git submodule.
mstsirkin authored May 4, 2009
467 module_clone "$path" "$url" "$reference"|| exit
1b4735d @olsonse submodule: no [--merge|--rebase] when newly cloned
olsonse authored Feb 17, 2011
468 cloned_modules="$cloned_modules;$name"
bf2d824 @hjemli git-submodule: remember to checkout after clone
hjemli authored Jun 11, 2007
469 subsha1=
470 else
74ae141 @Oblomov submodules: ensure clean environment when operating in a submodule
Oblomov authored Feb 24, 2010
471 subsha1=$(clear_local_git_env; cd "$path" &&
5be6007 @gitster Rewrite "git-frotz" to "git frotz"
gitster authored Jul 3, 2007
472 git rev-parse --verify HEAD) ||
941987a @hjemli git-submodule: give submodules proper names
hjemli authored Jun 11, 2007
473 die "Unable to find current revision in submodule path '$path'"
70c7ac2 @hjemli Add git-submodule command
hjemli authored May 26, 2007
474 fi
211b7f1 @hjemli git-submodule: clone during update, not during init
hjemli authored Jun 6, 2007
475
3294842 @jherland Rename submodule.<name>.rebase to submodule.<name>.update
jherland authored Jun 3, 2009
476 if ! test -z "$update"
ca2cedb @whot git-submodule: add support for --rebase.
whot authored Apr 23, 2009
477 then
3294842 @jherland Rename submodule.<name>.rebase to submodule.<name>.update
jherland authored Jun 3, 2009
478 update_module=$update
ca2cedb @whot git-submodule: add support for --rebase.
whot authored Apr 23, 2009
479 fi
480
70c7ac2 @hjemli Add git-submodule command
hjemli authored May 26, 2007
481 if test "$subsha1" != "$sha1"
482 then
b9b378a @pkufranky git-submodule: Fix "Unable to checkout" for the initial 'update'
pkufranky authored Sep 26, 2008
483 force=
484 if test -z "$subsha1"
485 then
486 force="-f"
487 fi
31ca3ac @Fabianx submodule: add --no-fetch parameter to update command
Fabianx authored Feb 5, 2009
488
489 if test -z "$nofetch"
490 then
e5f522d @jlehmann submodule update: Don't fetch when the submodule commit is already pr…
jlehmann authored Mar 6, 2011
491 # Run fetch only if $sha1 isn't present or it
492 # is not reachable from a ref.
74ae141 @Oblomov submodules: ensure clean environment when operating in a submodule
Oblomov authored Feb 24, 2010
493 (clear_local_git_env; cd "$path" &&
f5799e0 @drafnel git-submodule.sh: separate parens by a space to avoid confusing some …
drafnel authored May 26, 2011
494 ( (rev=$(git rev-list -n 1 $sha1 --not --all 2>/dev/null) &&
e5f522d @jlehmann submodule update: Don't fetch when the submodule commit is already pr…
jlehmann authored Mar 6, 2011
495 test -z "$rev") || git-fetch)) ||
31ca3ac @Fabianx submodule: add --no-fetch parameter to update command
Fabianx authored Feb 5, 2009
496 die "Unable to fetch in submodule path '$path'"
497 fi
498
1b4735d @olsonse submodule: no [--merge|--rebase] when newly cloned
olsonse authored Feb 17, 2011
499 # Is this something we just cloned?
500 case ";$cloned_modules;" in
501 *";$name;"*)
502 # then there is no local change to integrate
503 update_module= ;;
504 esac
505
3294842 @jherland Rename submodule.<name>.rebase to submodule.<name>.update
jherland authored Jun 3, 2009
506 case "$update_module" in
507 rebase)
508 command="git rebase"
ca2cedb @whot git-submodule: add support for --rebase.
whot authored Apr 23, 2009
509 action="rebase"
510 msg="rebased onto"
3294842 @jherland Rename submodule.<name>.rebase to submodule.<name>.update
jherland authored Jun 3, 2009
511 ;;
42b4917 @jherland git-submodule: add support for --merge.
jherland authored Jun 2, 2009
512 merge)
513 command="git merge"
514 action="merge"
515 msg="merged in"
516 ;;
3294842 @jherland Rename submodule.<name>.rebase to submodule.<name>.update
jherland authored Jun 3, 2009
517 *)
518 command="git checkout $force -q"
ca2cedb @whot git-submodule: add support for --rebase.
whot authored Apr 23, 2009
519 action="checkout"
520 msg="checked out"
3294842 @jherland Rename submodule.<name>.rebase to submodule.<name>.update
jherland authored Jun 3, 2009
521 ;;
522 esac
70c7ac2 @hjemli Add git-submodule command
hjemli authored May 26, 2007
523
74ae141 @Oblomov submodules: ensure clean environment when operating in a submodule
Oblomov authored Feb 24, 2010
524 (clear_local_git_env; cd "$path" && $command "$sha1") ||
ca2cedb @whot git-submodule: add support for --rebase.
whot authored Apr 23, 2009
525 die "Unable to $action '$sha1' in submodule path '$path'"
526 say "Submodule path '$path': $msg '$sha1'"
70c7ac2 @hjemli Add git-submodule command
hjemli authored May 26, 2007
527 fi
b13fd5c @jherland git submodule update: Introduce --recursive to update nested submodules
jherland authored Aug 19, 2009
528
529 if test -n "$recursive"
530 then
98dbe63 @kballard submodule: only preserve flags across recursive status/update invocat…
kballard authored Nov 3, 2010
531 (clear_local_git_env; cd "$path" && eval cmd_update "$orig_flags") ||
b13fd5c @jherland git submodule update: Introduce --recursive to update nested submodules
jherland authored Aug 19, 2009
532 die "Failed to recurse into submodule path '$path'"
533 fi
70c7ac2 @hjemli Add git-submodule command
hjemli authored May 26, 2007
534 done
535 }
536
bffe71f git-submodule: Instead of using only annotated tags, use any tags.
Emil Medve authored Jun 26, 2007
537 set_name_rev () {
538 revname=$( (
74ae141 @Oblomov submodules: ensure clean environment when operating in a submodule
Oblomov authored Feb 24, 2010
539 clear_local_git_env
bffe71f git-submodule: Instead of using only annotated tags, use any tags.
Emil Medve authored Jun 26, 2007
540 cd "$1" && {
5be6007 @gitster Rewrite "git-frotz" to "git frotz"
gitster authored Jul 3, 2007
541 git describe "$2" 2>/dev/null ||
542 git describe --tags "$2" 2>/dev/null ||
f669ac0 @mark987 git-submodule - possibly use branch name to describe a module
mark987 authored Apr 14, 2008
543 git describe --contains "$2" 2>/dev/null ||
544 git describe --all --always "$2"
bffe71f git-submodule: Instead of using only annotated tags, use any tags.
Emil Medve authored Jun 26, 2007
545 }
546 ) )
547 test -z "$revname" || revname=" ($revname)"
548 }
28f9af5 @pkufranky git-submodule summary: code framework
pkufranky authored Mar 11, 2008
549 #
550 # Show commit summary for submodules in index or working tree
551 #
552 # If '--cached' is given, show summary between index and given commit,
553 # or between working tree and given commit
554 #
555 # $@ = [commit (default 'HEAD'),] requested paths (default all)
556 #
557 cmd_summary() {
f2dc06a @pkufranky git-submodule summary: limit summary size
pkufranky authored Mar 11, 2008
558 summary_limit=-1
d0f64dd @pkufranky git-submodule summary: --for-status option
pkufranky authored Apr 12, 2008
559 for_status=
1c244f6 @jlehmann git submodule summary: add --files option
jlehmann authored Aug 13, 2009
560 diff_cmd=diff-index
f2dc06a @pkufranky git-submodule summary: limit summary size
pkufranky authored Mar 11, 2008
561
28f9af5 @pkufranky git-submodule summary: code framework
pkufranky authored Mar 11, 2008
562 # parse $args after "submodule ... summary".
563 while test $# -ne 0
564 do
565 case "$1" in
566 --cached)
567 cached="$1"
568 ;;
1c244f6 @jlehmann git submodule summary: add --files option
jlehmann authored Aug 13, 2009
569 --files)
570 files="$1"
571 ;;
d0f64dd @pkufranky git-submodule summary: --for-status option
pkufranky authored Apr 12, 2008
572 --for-status)
573 for_status="$1"
574 ;;
f2dc06a @pkufranky git-submodule summary: limit summary size
pkufranky authored Mar 11, 2008
575 -n|--summary-limit)
576 if summary_limit=$(($2 + 0)) 2>/dev/null && test "$summary_limit" = "$2"
577 then
578 :
579 else
580 usage
581 fi
582 shift
583 ;;
28f9af5 @pkufranky git-submodule summary: code framework
pkufranky authored Mar 11, 2008
584 --)
585 shift
586 break
587 ;;
588 -*)
589 usage
590 ;;
591 *)
592 break
593 ;;
594 esac
595 shift
596 done
bffe71f git-submodule: Instead of using only annotated tags, use any tags.
Emil Medve authored Jun 26, 2007
597
f2dc06a @pkufranky git-submodule summary: limit summary size
pkufranky authored Mar 11, 2008
598 test $summary_limit = 0 && return
599
3deea89 @jherland submodule summary: Don't barf when invoked in an empty repo
jherland authored Feb 16, 2010
600 if rev=$(git rev-parse -q --verify --default HEAD ${1+"$1"})
28f9af5 @pkufranky git-submodule summary: code framework
pkufranky authored Mar 11, 2008
601 then
602 head=$rev
caa9c3c @peff submodule summary: do not shift a non-existent positional variable
peff authored Mar 3, 2010
603 test $# = 0 || shift
3deea89 @jherland submodule summary: Don't barf when invoked in an empty repo
jherland authored Feb 16, 2010
604 elif test -z "$1" -o "$1" = "HEAD"
605 then
14e940d @gitster submodule summary: do not fail before the first commit
gitster authored Mar 3, 2010
606 # before the first commit: compare with an empty tree
607 head=$(git hash-object -w -t tree --stdin </dev/null)
2ea6c2c @jlehmann git submodule summary: Handle HEAD as argument when on an unborn branch
jlehmann authored Mar 9, 2010
608 test -z "$1" || shift
28f9af5 @pkufranky git-submodule summary: code framework
pkufranky authored Mar 11, 2008
609 else
3deea89 @jherland submodule summary: Don't barf when invoked in an empty repo
jherland authored Feb 16, 2010
610 head="HEAD"
28f9af5 @pkufranky git-submodule summary: code framework
pkufranky authored Mar 11, 2008
611 fi
612
1c244f6 @jlehmann git submodule summary: add --files option
jlehmann authored Aug 13, 2009
613 if [ -n "$files" ]
614 then
615 test -n "$cached" &&
616 die "--cached cannot be used with --files"
617 diff_cmd=diff-files
618 head=
619 fi
620
28f9af5 @pkufranky git-submodule summary: code framework
pkufranky authored Mar 11, 2008
621 cd_to_toplevel
622 # Get modified modules cared by user
1807650 @jlehmann git submodule: ignore dirty submodules for summary and status
jlehmann authored Jun 25, 2010
623 modules=$(git $diff_cmd $cached --ignore-submodules=dirty --raw $head -- "$@" |
e1622bf @gitster Protect scripted Porcelains from GREP_OPTIONS insanity
gitster authored Nov 23, 2009
624 sane_egrep '^:([0-7]* )?160000' |
28f9af5 @pkufranky git-submodule summary: code framework
pkufranky authored Mar 11, 2008
625 while read mod_src mod_dst sha1_src sha1_dst status name
626 do
627 # Always show modules deleted or type-changed (blob<->module)
628 test $status = D -o $status = T && echo "$name" && continue
629 # Also show added or modified modules which are checked out
630 GIT_DIR="$name/.git" git-rev-parse --git-dir >/dev/null 2>&1 &&
631 echo "$name"
632 done
633 )
1cb639e @pkufranky git-submodule summary: show commit summary
pkufranky authored Mar 11, 2008
634
d0f64dd @pkufranky git-submodule summary: --for-status option
pkufranky authored Apr 12, 2008
635 test -z "$modules" && return
636
1807650 @jlehmann git submodule: ignore dirty submodules for summary and status
jlehmann authored Jun 25, 2010
637 git $diff_cmd $cached --ignore-submodules=dirty --raw $head -- $modules |
e1622bf @gitster Protect scripted Porcelains from GREP_OPTIONS insanity
gitster authored Nov 23, 2009
638 sane_egrep '^:([0-7]* )?160000' |
1cb639e @pkufranky git-submodule summary: show commit summary
pkufranky authored Mar 11, 2008
639 cut -c2- |
640 while read mod_src mod_dst sha1_src sha1_dst status name
641 do
642 if test -z "$cached" &&
643 test $sha1_dst = 0000000000000000000000000000000000000000
644 then
645 case "$mod_dst" in
646 160000)
647 sha1_dst=$(GIT_DIR="$name/.git" git rev-parse HEAD)
648 ;;
649 100644 | 100755 | 120000)
650 sha1_dst=$(git hash-object $name)
651 ;;
652 000000)
653 ;; # removed
654 *)
655 # unexpected type
656 echo >&2 "unexpected mode $mod_dst"
657 continue ;;
658 esac
659 fi
660 missing_src=
661 missing_dst=
662
663 test $mod_src = 160000 &&
30353a4 submodule: use git rev-parse -q
Miklos Vajna authored Dec 3, 2008
664 ! GIT_DIR="$name/.git" git-rev-parse -q --verify $sha1_src^0 >/dev/null &&
1cb639e @pkufranky git-submodule summary: show commit summary
pkufranky authored Mar 11, 2008
665 missing_src=t
666
667 test $mod_dst = 160000 &&
30353a4 submodule: use git rev-parse -q
Miklos Vajna authored Dec 3, 2008
668 ! GIT_DIR="$name/.git" git-rev-parse -q --verify $sha1_dst^0 >/dev/null &&
1cb639e @pkufranky git-submodule summary: show commit summary
pkufranky authored Mar 11, 2008
669 missing_dst=t
bffe71f git-submodule: Instead of using only annotated tags, use any tags.
Emil Medve authored Jun 26, 2007
670
1cb639e @pkufranky git-submodule summary: show commit summary
pkufranky authored Mar 11, 2008
671 total_commits=
672 case "$missing_src,$missing_dst" in
673 t,)
674 errmsg=" Warn: $name doesn't contain commit $sha1_src"
675 ;;
676 ,t)
677 errmsg=" Warn: $name doesn't contain commit $sha1_dst"
678 ;;
679 t,t)
680 errmsg=" Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
681 ;;
682 *)
683 errmsg=
684 total_commits=$(
685 if test $mod_src = 160000 -a $mod_dst = 160000
686 then
687 range="$sha1_src...$sha1_dst"
688 elif test $mod_src = 160000
689 then
690 range=$sha1_src
691 else
692 range=$sha1_dst
693 fi
694 GIT_DIR="$name/.git" \
b0e621a @peff script with rev-list instead of log
peff authored Apr 8, 2010
695 git rev-list --first-parent $range -- | wc -l
1cb639e @pkufranky git-submodule summary: show commit summary
pkufranky authored Mar 11, 2008
696 )
eed3559 git-submodule summary: fix that some "wc" flavors produce leading spaces
Johannes Sixt authored Mar 12, 2008
697 total_commits=" ($(($total_commits + 0)))"
1cb639e @pkufranky git-submodule summary: show commit summary
pkufranky authored Mar 11, 2008
698 ;;
699 esac
700
701 sha1_abbr_src=$(echo $sha1_src | cut -c1-7)
702 sha1_abbr_dst=$(echo $sha1_dst | cut -c1-7)
703 if test $status = T
704 then
705 if test $mod_dst = 160000
706 then
707 echo "* $name $sha1_abbr_src(blob)->$sha1_abbr_dst(submodule)$total_commits:"
708 else
709 echo "* $name $sha1_abbr_src(submodule)->$sha1_abbr_dst(blob)$total_commits:"
710 fi
711 else
712 echo "* $name $sha1_abbr_src...$sha1_abbr_dst$total_commits:"
713 fi
714 if test -n "$errmsg"
715 then
716 # Don't give error msg for modification whose dst is not submodule
717 # i.e. deleted or changed to blob
718 test $mod_dst = 160000 && echo "$errmsg"
719 else
720 if test $mod_src = 160000 -a $mod_dst = 160000
721 then
f2dc06a @pkufranky git-submodule summary: limit summary size
pkufranky authored Mar 11, 2008
722 limit=
723 test $summary_limit -gt 0 && limit="-$summary_limit"
1cb639e @pkufranky git-submodule summary: show commit summary
pkufranky authored Mar 11, 2008
724 GIT_DIR="$name/.git" \
f2dc06a @pkufranky git-submodule summary: limit summary size
pkufranky authored Mar 11, 2008
725 git log $limit --pretty='format: %m %s' \
1cb639e @pkufranky git-submodule summary: show commit summary
pkufranky authored Mar 11, 2008
726 --first-parent $sha1_src...$sha1_dst
727 elif test $mod_dst = 160000
728 then
729 GIT_DIR="$name/.git" \
730 git log --pretty='format: > %s' -1 $sha1_dst
731 else
732 GIT_DIR="$name/.git" \
733 git log --pretty='format: < %s' -1 $sha1_src
734 fi
735 echo
736 fi
737 echo
d0f64dd @pkufranky git-submodule summary: --for-status option
pkufranky authored Apr 12, 2008
738 done |
739 if test -n "$for_status"; then
f17a5d3 @jlehmann git status: Show uncommitted submodule changes too when enabled
jlehmann authored Jan 17, 2010
740 if [ -n "$files" ]; then
741 echo "# Submodules changed but not updated:"
742 else
743 echo "# Submodule changes to be committed:"
744 fi
d0f64dd @pkufranky git-submodule summary: --for-status option
pkufranky authored Apr 12, 2008
745 echo "#"
746 sed -e 's|^|# |' -e 's|^# $|#|'
747 else
748 cat
749 fi
28f9af5 @pkufranky git-submodule summary: code framework
pkufranky authored Mar 11, 2008
750 }
70c7ac2 @hjemli Add git-submodule command
hjemli authored May 26, 2007
751 #
941987a @hjemli git-submodule: give submodules proper names
hjemli authored Jun 11, 2007
752 # List all submodules, prefixed with:
70c7ac2 @hjemli Add git-submodule command
hjemli authored May 26, 2007
753 # - submodule not initialized
754 # + different revision checked out
755 #
756 # If --cached was specified the revision in the index will be printed
757 # instead of the currently checked out revision.
758 #
759 # $@ = requested paths (default to all)
760 #
23a485e @gitster git-submodule: rename shell functions for consistency
gitster authored Jan 15, 2008
761 cmd_status()
70c7ac2 @hjemli Add git-submodule command
hjemli authored May 26, 2007
762 {
5c08dbb @gitster git-submodule: fix subcommand parser
gitster authored Jan 15, 2008
763 # parse $args after "submodule ... status".
98dbe63 @kballard submodule: only preserve flags across recursive status/update invocat…
kballard authored Nov 3, 2010
764 orig_flags=
5c08dbb @gitster git-submodule: fix subcommand parser
gitster authored Jan 15, 2008
765 while test $# -ne 0
766 do
767 case "$1" in
768 -q|--quiet)
2e6a30e @bebarino submodule, repack: migrate to git-sh-setup's say()
bebarino authored Jun 16, 2009
769 GIT_QUIET=1
5c08dbb @gitster git-submodule: fix subcommand parser
gitster authored Jan 15, 2008
770 ;;
771 --cached)
772 cached=1
773 ;;
64b19ff @jherland git submodule status: Add --recursive to recurse into nested submodules
jherland authored Aug 19, 2009
774 --recursive)
775 recursive=1
776 ;;
5c08dbb @gitster git-submodule: fix subcommand parser
gitster authored Jan 15, 2008
777 --)
778 shift
779 break
780 ;;
781 -*)
782 usage
783 ;;
784 *)
785 break
786 ;;
787 esac
98dbe63 @kballard submodule: only preserve flags across recursive status/update invocat…
kballard authored Nov 3, 2010
788 orig_flags="$orig_flags $(git rev-parse --sq-quote "$1")"
5c08dbb @gitster git-submodule: fix subcommand parser
gitster authored Jan 15, 2008
789 shift
790 done
791
a7b3269 @davvid git-submodule: replace duplicated code with a module_list function
davvid authored Aug 22, 2008
792 module_list "$@" |
70c7ac2 @hjemli Add git-submodule command
hjemli authored May 26, 2007
793 while read mode sha1 stage path
794 do
941987a @hjemli git-submodule: give submodules proper names
hjemli authored Jun 11, 2007
795 name=$(module_name "$path") || exit
5be6007 @gitster Rewrite "git-frotz" to "git frotz"
gitster authored Jul 3, 2007
796 url=$(git config submodule."$name".url)
64b19ff @jherland git submodule status: Add --recursive to recurse into nested submodules
jherland authored Aug 19, 2009
797 displaypath="$prefix$path"
313ee0d submodule: process conflicting submodules only once
Nicolas Morey-Chaisemartin authored Mar 30, 2011
798 if test "$stage" = U
799 then
800 say "U$sha1 $displaypath"
801 continue
802 fi
ba88a1f @hjemli Teach git-submodule.sh about the .git file
hjemli authored Feb 20, 2008
803 if test -z "$url" || ! test -d "$path"/.git -o -f "$path"/.git
70c7ac2 @hjemli Add git-submodule command
hjemli authored May 26, 2007
804 then
64b19ff @jherland git submodule status: Add --recursive to recurse into nested submodules
jherland authored Aug 19, 2009
805 say "-$sha1 $displaypath"
70c7ac2 @hjemli Add git-submodule command
hjemli authored May 26, 2007
806 continue;
807 fi
41c7c1b @neurocyte git-submodule: Fix two instances of the same typo
neurocyte authored Jul 4, 2007
808 set_name_rev "$path" "$sha1"
1807650 @jlehmann git submodule: ignore dirty submodules for summary and status
jlehmann authored Jun 25, 2010
809 if git diff-files --ignore-submodules=dirty --quiet -- "$path"
70c7ac2 @hjemli Add git-submodule command
hjemli authored May 26, 2007
810 then
64b19ff @jherland git submodule status: Add --recursive to recurse into nested submodules
jherland authored Aug 19, 2009
811 say " $sha1 $displaypath$revname"
70c7ac2 @hjemli Add git-submodule command
hjemli authored May 26, 2007
812 else
813 if test -z "$cached"
814 then
74ae141 @Oblomov submodules: ensure clean environment when operating in a submodule
Oblomov authored Feb 24, 2010
815 sha1=$(clear_local_git_env; cd "$path" && git rev-parse --verify HEAD)
41c7c1b @neurocyte git-submodule: Fix two instances of the same typo
neurocyte authored Jul 4, 2007
816 set_name_rev "$path" "$sha1"
70c7ac2 @hjemli Add git-submodule command
hjemli authored May 26, 2007
817 fi
64b19ff @jherland git submodule status: Add --recursive to recurse into nested submodules
jherland authored Aug 19, 2009
818 say "+$sha1 $displaypath$revname"
819 fi
820
821 if test -n "$recursive"
822 then
823 (
824 prefix="$displaypath/"
74ae141 @Oblomov submodules: ensure clean environment when operating in a submodule
Oblomov authored Feb 24, 2010
825 clear_local_git_env
64b19ff @jherland git submodule status: Add --recursive to recurse into nested submodules
jherland authored Aug 19, 2009
826 cd "$path" &&
a7eff1a @kballard submodule: preserve all arguments exactly when recursing
kballard authored Nov 2, 2010
827 eval cmd_status "$orig_args"
64b19ff @jherland git submodule status: Add --recursive to recurse into nested submodules
jherland authored Aug 19, 2009
828 ) ||
829 die "Failed to recurse into submodule path '$path'"
70c7ac2 @hjemli Add git-submodule command
hjemli authored May 26, 2007
830 fi
831 done
832 }
2327f61 @davvid git-submodule: add "sync" command
davvid authored Aug 24, 2008
833 #
834 # Sync remote urls for submodules
835 # This makes the value for remote.$remote.url match the value
836 # specified in .gitmodules.
837 #
838 cmd_sync()
839 {
840 while test $# -ne 0
841 do
842 case "$1" in
843 -q|--quiet)
2e6a30e @bebarino submodule, repack: migrate to git-sh-setup's say()
bebarino authored Jun 16, 2009
844 GIT_QUIET=1
2327f61 @davvid git-submodule: add "sync" command
davvid authored Aug 24, 2008
845 shift
846 ;;
847 --)
848 shift
849 break
850 ;;
851 -*)
852 usage
853 ;;
854 *)
855 break
856 ;;
857 esac
858 done
859 cd_to_toplevel
860 module_list "$@" |
861 while read mode sha1 stage path
862 do
863 name=$(module_name "$path")
864 url=$(git config -f .gitmodules --get submodule."$name".url)
baede9f @jherland Fix submodule sync with relative submodule URLs
jherland authored Sep 22, 2008
865
866 # Possibly a url relative to parent
867 case "$url" in
868 ./*|../*)
869 url=$(resolve_relative_url "$url") || exit
870 ;;
871 esac
872
33f072f @andi5 submodule sync: Update "submodule.<name>.url" for empty directories
andi5 authored Oct 8, 2010
873 say "Synchronizing submodule url for '$name'"
874 git config submodule."$name".url "$url"
875
2327f61 @davvid git-submodule: add "sync" command
davvid authored Aug 24, 2008
876 if test -e "$path"/.git
877 then
878 (
74ae141 @Oblomov submodules: ensure clean environment when operating in a submodule
Oblomov authored Feb 24, 2010
879 clear_local_git_env
2327f61 @davvid git-submodule: add "sync" command
davvid authored Aug 24, 2008
880 cd "$path"
881 remote=$(get_default_remote)
882 git config remote."$remote".url "$url"
883 )
884 fi
885 done
886 }
70c7ac2 @hjemli Add git-submodule command
hjemli authored May 26, 2007
887
5c08dbb @gitster git-submodule: fix subcommand parser
gitster authored Jan 15, 2008
888 # This loop parses the command line arguments to find the
889 # subcommand name to dispatch. Parsing of the subcommand specific
890 # options are primarily done by the subcommand implementations.
891 # Subcommand specific options such as --branch and --cached are
892 # parsed here as well, for backward compatibility.
893
894 while test $# != 0 && test -z "$command"
70c7ac2 @hjemli Add git-submodule command
hjemli authored May 26, 2007
895 do
896 case "$1" in
2327f61 @davvid git-submodule: add "sync" command
davvid authored Aug 24, 2008
897 add | foreach | init | update | status | summary | sync)
5c08dbb @gitster git-submodule: fix subcommand parser
gitster authored Jan 15, 2008
898 command=$1
70c7ac2 @hjemli Add git-submodule command
hjemli authored May 26, 2007
899 ;;
900 -q|--quiet)
2e6a30e @bebarino submodule, repack: migrate to git-sh-setup's say()
bebarino authored Jun 16, 2009
901 GIT_QUIET=1
70c7ac2 @hjemli Add git-submodule command
hjemli authored May 26, 2007
902 ;;
ecda072 git-submodule: provide easy way of adding new submodules
Sven Verdoolaege authored Jun 24, 2007
903 -b|--branch)
904 case "$2" in
905 '')
906 usage
907 ;;
908 esac
909 branch="$2"; shift
910 ;;
70c7ac2 @hjemli Add git-submodule command
hjemli authored May 26, 2007
911 --cached)
28f9af5 @pkufranky git-submodule summary: code framework
pkufranky authored Mar 11, 2008
912 cached="$1"
70c7ac2 @hjemli Add git-submodule command
hjemli authored May 26, 2007
913 ;;
914 --)
915 break
916 ;;
917 -*)
918 usage
919 ;;
920 *)
921 break
922 ;;
923 esac
924 shift
925 done
926
5c08dbb @gitster git-submodule: fix subcommand parser
gitster authored Jan 15, 2008
927 # No command word defaults to "status"
928 test -n "$command" || command=status
929
930 # "-b branch" is accepted only by "add"
931 if test -n "$branch" && test "$command" != add
932 then
ecda072 git-submodule: provide easy way of adding new submodules
Sven Verdoolaege authored Jun 24, 2007
933 usage
5c08dbb @gitster git-submodule: fix subcommand parser
gitster authored Jan 15, 2008
934 fi
935
28f9af5 @pkufranky git-submodule summary: code framework
pkufranky authored Mar 11, 2008
936 # "--cached" is accepted only by "status" and "summary"
937 if test -n "$cached" && test "$command" != status -a "$command" != summary
5c08dbb @gitster git-submodule: fix subcommand parser
gitster authored Jan 15, 2008
938 then
70c7ac2 @hjemli Add git-submodule command
hjemli authored May 26, 2007
939 usage
5c08dbb @gitster git-submodule: fix subcommand parser
gitster authored Jan 15, 2008
940 fi
941
942 "cmd_$command" "$@"
Something went wrong with that request. Please try again.