]> git.ipfire.org Git - thirdparty/git.git/blame - builtin/submodule--helper.c
submodule update --init: display correct path from submodule
[thirdparty/git.git] / builtin / submodule--helper.c
CommitLineData
74703a1e
SB
1#include "builtin.h"
2#include "cache.h"
3#include "parse-options.h"
4#include "quote.h"
5#include "pathspec.h"
6#include "dir.h"
7#include "utf8.h"
0ea306ef
SB
8#include "submodule.h"
9#include "submodule-config.h"
10#include "string-list.h"
ee8838d1 11#include "run-command.h"
63e95beb
SB
12#include "remote.h"
13#include "refs.h"
14#include "connect.h"
15
16static char *get_default_remote(void)
17{
18 char *dest = NULL, *ret;
19 unsigned char sha1[20];
20 struct strbuf sb = STRBUF_INIT;
21 const char *refname = resolve_ref_unsafe("HEAD", 0, sha1, NULL);
22
23 if (!refname)
24 die(_("No such ref: %s"), "HEAD");
25
26 /* detached HEAD */
27 if (!strcmp(refname, "HEAD"))
28 return xstrdup("origin");
29
30 if (!skip_prefix(refname, "refs/heads/", &refname))
31 die(_("Expecting a full ref name, got %s"), refname);
32
33 strbuf_addf(&sb, "branch.%s.remote", refname);
34 if (git_config_get_string(sb.buf, &dest))
35 ret = xstrdup("origin");
36 else
37 ret = dest;
38
39 strbuf_release(&sb);
40 return ret;
41}
42
43static int starts_with_dot_slash(const char *str)
44{
45 return str[0] == '.' && is_dir_sep(str[1]);
46}
47
48static int starts_with_dot_dot_slash(const char *str)
49{
50 return str[0] == '.' && str[1] == '.' && is_dir_sep(str[2]);
51}
52
53/*
54 * Returns 1 if it was the last chop before ':'.
55 */
56static int chop_last_dir(char **remoteurl, int is_relative)
57{
58 char *rfind = find_last_dir_sep(*remoteurl);
59 if (rfind) {
60 *rfind = '\0';
61 return 0;
62 }
63
64 rfind = strrchr(*remoteurl, ':');
65 if (rfind) {
66 *rfind = '\0';
67 return 1;
68 }
69
70 if (is_relative || !strcmp(".", *remoteurl))
71 die(_("cannot strip one component off url '%s'"),
72 *remoteurl);
73
74 free(*remoteurl);
75 *remoteurl = xstrdup(".");
76 return 0;
77}
78
79/*
80 * The `url` argument is the URL that navigates to the submodule origin
81 * repo. When relative, this URL is relative to the superproject origin
82 * URL repo. The `up_path` argument, if specified, is the relative
83 * path that navigates from the submodule working tree to the superproject
84 * working tree. Returns the origin URL of the submodule.
85 *
86 * Return either an absolute URL or filesystem path (if the superproject
87 * origin URL is an absolute URL or filesystem path, respectively) or a
88 * relative file system path (if the superproject origin URL is a relative
89 * file system path).
90 *
91 * When the output is a relative file system path, the path is either
92 * relative to the submodule working tree, if up_path is specified, or to
93 * the superproject working tree otherwise.
94 *
95 * NEEDSWORK: This works incorrectly on the domain and protocol part.
96 * remote_url url outcome expectation
97 * http://a.com/b ../c http://a.com/c as is
08788504
SB
98 * http://a.com/b/ ../c http://a.com/c same as previous line, but
99 * ignore trailing slash in url
63e95beb
SB
100 * http://a.com/b ../../c http://c error out
101 * http://a.com/b ../../../c http:/c error out
102 * http://a.com/b ../../../../c http:c error out
103 * http://a.com/b ../../../../../c .:c error out
104 * NEEDSWORK: Given how chop_last_dir() works, this function is broken
105 * when a local part has a colon in its path component, too.
106 */
107static char *relative_url(const char *remote_url,
108 const char *url,
109 const char *up_path)
110{
111 int is_relative = 0;
112 int colonsep = 0;
113 char *out;
114 char *remoteurl = xstrdup(remote_url);
115 struct strbuf sb = STRBUF_INIT;
116 size_t len = strlen(remoteurl);
117
08788504
SB
118 if (is_dir_sep(remoteurl[len-1]))
119 remoteurl[len-1] = '\0';
63e95beb
SB
120
121 if (!url_is_local_not_ssh(remoteurl) || is_absolute_path(remoteurl))
122 is_relative = 0;
123 else {
124 is_relative = 1;
125 /*
126 * Prepend a './' to ensure all relative
127 * remoteurls start with './' or '../'
128 */
129 if (!starts_with_dot_slash(remoteurl) &&
130 !starts_with_dot_dot_slash(remoteurl)) {
131 strbuf_reset(&sb);
132 strbuf_addf(&sb, "./%s", remoteurl);
133 free(remoteurl);
134 remoteurl = strbuf_detach(&sb, NULL);
135 }
136 }
137 /*
138 * When the url starts with '../', remove that and the
139 * last directory in remoteurl.
140 */
141 while (url) {
142 if (starts_with_dot_dot_slash(url)) {
143 url += 3;
144 colonsep |= chop_last_dir(&remoteurl, is_relative);
145 } else if (starts_with_dot_slash(url))
146 url += 2;
147 else
148 break;
149 }
150 strbuf_reset(&sb);
151 strbuf_addf(&sb, "%s%s%s", remoteurl, colonsep ? ":" : "/", url);
3389e78e
SB
152 if (ends_with(url, "/"))
153 strbuf_setlen(&sb, sb.len - 1);
63e95beb
SB
154 free(remoteurl);
155
156 if (starts_with_dot_slash(sb.buf))
157 out = xstrdup(sb.buf + 2);
158 else
159 out = xstrdup(sb.buf);
160 strbuf_reset(&sb);
161
162 if (!up_path || !is_relative)
163 return out;
164
165 strbuf_addf(&sb, "%s%s", up_path, out);
166 free(out);
167 return strbuf_detach(&sb, NULL);
168}
169
170static int resolve_relative_url(int argc, const char **argv, const char *prefix)
171{
172 char *remoteurl = NULL;
173 char *remote = get_default_remote();
174 const char *up_path = NULL;
175 char *res;
176 const char *url;
177 struct strbuf sb = STRBUF_INIT;
178
179 if (argc != 2 && argc != 3)
180 die("resolve-relative-url only accepts one or two arguments");
181
182 url = argv[1];
183 strbuf_addf(&sb, "remote.%s.url", remote);
184 free(remote);
185
186 if (git_config_get_string(sb.buf, &remoteurl))
187 /* the repository is its own authoritative upstream */
188 remoteurl = xgetcwd();
189
190 if (argc == 3)
191 up_path = argv[2];
192
193 res = relative_url(remoteurl, url, up_path);
194 puts(res);
195 free(res);
196 free(remoteurl);
197 return 0;
198}
199
200static int resolve_relative_url_test(int argc, const char **argv, const char *prefix)
201{
202 char *remoteurl, *res;
203 const char *up_path, *url;
204
205 if (argc != 4)
206 die("resolve-relative-url-test only accepts three arguments: <up_path> <remoteurl> <url>");
207
208 up_path = argv[1];
209 remoteurl = xstrdup(argv[2]);
210 url = argv[3];
211
212 if (!strcmp(up_path, "(null)"))
213 up_path = NULL;
214
215 res = relative_url(remoteurl, url, up_path);
216 puts(res);
217 free(res);
218 free(remoteurl);
219 return 0;
220}
74703a1e
SB
221
222struct module_list {
223 const struct cache_entry **entries;
224 int alloc, nr;
225};
226#define MODULE_LIST_INIT { NULL, 0, 0 }
227
228static int module_list_compute(int argc, const char **argv,
229 const char *prefix,
230 struct pathspec *pathspec,
231 struct module_list *list)
232{
233 int i, result = 0;
2b56bb7a 234 char *ps_matched = NULL;
74703a1e
SB
235 parse_pathspec(pathspec, 0,
236 PATHSPEC_PREFER_FULL |
237 PATHSPEC_STRIP_SUBMODULE_SLASH_CHEAP,
238 prefix, argv);
239
74703a1e
SB
240 if (pathspec->nr)
241 ps_matched = xcalloc(pathspec->nr, 1);
242
243 if (read_cache() < 0)
244 die(_("index file corrupt"));
245
246 for (i = 0; i < active_nr; i++) {
247 const struct cache_entry *ce = active_cache[i];
248
84ba959b
SB
249 if (!match_pathspec(pathspec, ce->name, ce_namelen(ce),
250 0, ps_matched, 1) ||
251 !S_ISGITLINK(ce->ce_mode))
74703a1e
SB
252 continue;
253
254 ALLOC_GROW(list->entries, list->nr + 1, list->alloc);
255 list->entries[list->nr++] = ce;
256 while (i + 1 < active_nr &&
257 !strcmp(ce->name, active_cache[i + 1]->name))
258 /*
259 * Skip entries with the same name in different stages
260 * to make sure an entry is returned only once.
261 */
262 i++;
263 }
74703a1e
SB
264
265 if (ps_matched && report_path_error(ps_matched, pathspec, prefix))
266 result = -1;
267
268 free(ps_matched);
269
270 return result;
271}
272
273static int module_list(int argc, const char **argv, const char *prefix)
274{
275 int i;
276 struct pathspec pathspec;
277 struct module_list list = MODULE_LIST_INIT;
278
279 struct option module_list_options[] = {
280 OPT_STRING(0, "prefix", &prefix,
281 N_("path"),
282 N_("alternative anchor for relative paths")),
283 OPT_END()
284 };
285
286 const char *const git_submodule_helper_usage[] = {
287 N_("git submodule--helper list [--prefix=<path>] [<path>...]"),
288 NULL
289 };
290
291 argc = parse_options(argc, argv, prefix, module_list_options,
292 git_submodule_helper_usage, 0);
293
b0f4b408 294 if (module_list_compute(argc, argv, prefix, &pathspec, &list) < 0)
74703a1e 295 return 1;
74703a1e
SB
296
297 for (i = 0; i < list.nr; i++) {
298 const struct cache_entry *ce = list.entries[i];
299
300 if (ce_stage(ce))
301 printf("%06o %s U\t", ce->ce_mode, sha1_to_hex(null_sha1));
302 else
99d1a986 303 printf("%06o %s %d\t", ce->ce_mode,
304 oid_to_hex(&ce->oid), ce_stage(ce));
74703a1e
SB
305
306 utf8_fprintf(stdout, "%s\n", ce->name);
307 }
308 return 0;
309}
310
3604242f
SB
311static void init_submodule(const char *path, const char *prefix, int quiet)
312{
313 const struct submodule *sub;
314 struct strbuf sb = STRBUF_INIT;
315 char *upd = NULL, *url = NULL, *displaypath;
316
317 /* Only loads from .gitmodules, no overlay with .git/config */
318 gitmodules_config();
319
6e7c14e6
SB
320 if (prefix && get_super_prefix())
321 die("BUG: cannot have prefix and superprefix");
322 else if (prefix)
323 displaypath = xstrdup(relative_path(path, prefix, &sb));
324 else if (get_super_prefix()) {
325 strbuf_addf(&sb, "%s%s", get_super_prefix(), path);
3604242f
SB
326 displaypath = strbuf_detach(&sb, NULL);
327 } else
d92028a5
SB
328 displaypath = xstrdup(path);
329
330 sub = submodule_from_path(null_sha1, path);
331
332 if (!sub)
333 die(_("No url found for submodule path '%s' in .gitmodules"),
334 displaypath);
3604242f
SB
335
336 /*
337 * Copy url setting when it is not set yet.
338 * To look up the url in .git/config, we must not fall back to
339 * .gitmodules, so look it up directly.
340 */
341 strbuf_reset(&sb);
342 strbuf_addf(&sb, "submodule.%s.url", sub->name);
343 if (git_config_get_string(sb.buf, &url)) {
344 url = xstrdup(sub->url);
345
346 if (!url)
347 die(_("No url found for submodule path '%s' in .gitmodules"),
348 displaypath);
349
350 /* Possibly a url relative to parent */
351 if (starts_with_dot_dot_slash(url) ||
352 starts_with_dot_slash(url)) {
353 char *remoteurl, *relurl;
354 char *remote = get_default_remote();
355 struct strbuf remotesb = STRBUF_INIT;
356 strbuf_addf(&remotesb, "remote.%s.url", remote);
357 free(remote);
358
359 if (git_config_get_string(remotesb.buf, &remoteurl))
360 /*
361 * The repository is its own
362 * authoritative upstream
363 */
364 remoteurl = xgetcwd();
365 relurl = relative_url(remoteurl, url, NULL);
366 strbuf_release(&remotesb);
367 free(remoteurl);
368 free(url);
369 url = relurl;
370 }
371
372 if (git_config_set_gently(sb.buf, url))
373 die(_("Failed to register url for submodule path '%s'"),
374 displaypath);
375 if (!quiet)
c66410ed
SB
376 fprintf(stderr,
377 _("Submodule '%s' (%s) registered for path '%s'\n"),
3604242f
SB
378 sub->name, url, displaypath);
379 }
380
381 /* Copy "update" setting when it is not set yet */
382 strbuf_reset(&sb);
383 strbuf_addf(&sb, "submodule.%s.update", sub->name);
384 if (git_config_get_string(sb.buf, &upd) &&
385 sub->update_strategy.type != SM_UPDATE_UNSPECIFIED) {
386 if (sub->update_strategy.type == SM_UPDATE_COMMAND) {
387 fprintf(stderr, _("warning: command update mode suggested for submodule '%s'\n"),
388 sub->name);
389 upd = xstrdup("none");
390 } else
391 upd = xstrdup(submodule_strategy_to_string(&sub->update_strategy));
392
393 if (git_config_set_gently(sb.buf, upd))
394 die(_("Failed to register update mode for submodule path '%s'"), displaypath);
395 }
396 strbuf_release(&sb);
397 free(displaypath);
398 free(url);
399 free(upd);
400}
401
402static int module_init(int argc, const char **argv, const char *prefix)
403{
404 struct pathspec pathspec;
405 struct module_list list = MODULE_LIST_INIT;
406 int quiet = 0;
407 int i;
408
409 struct option module_init_options[] = {
3604242f
SB
410 OPT__QUIET(&quiet, N_("Suppress output for initializing a submodule")),
411 OPT_END()
412 };
413
414 const char *const git_submodule_helper_usage[] = {
415 N_("git submodule--helper init [<path>]"),
416 NULL
417 };
418
419 argc = parse_options(argc, argv, prefix, module_init_options,
420 git_submodule_helper_usage, 0);
421
422 if (module_list_compute(argc, argv, prefix, &pathspec, &list) < 0)
423 return 1;
424
425 for (i = 0; i < list.nr; i++)
426 init_submodule(list.entries[i]->name, prefix, quiet);
427
428 return 0;
429}
430
0ea306ef
SB
431static int module_name(int argc, const char **argv, const char *prefix)
432{
433 const struct submodule *sub;
434
435 if (argc != 2)
436 usage(_("git submodule--helper name <path>"));
437
438 gitmodules_config();
439 sub = submodule_from_path(null_sha1, argv[1]);
440
441 if (!sub)
442 die(_("no submodule mapping found in .gitmodules for path '%s'"),
443 argv[1]);
444
445 printf("%s\n", sub->name);
446
447 return 0;
448}
14111fc4 449
ee8838d1 450static int clone_submodule(const char *path, const char *gitdir, const char *url,
72c5f883
JK
451 const char *depth, struct string_list *reference,
452 int quiet, int progress)
ee8838d1 453{
542aa25d 454 struct child_process cp = CHILD_PROCESS_INIT;
ee8838d1
SB
455
456 argv_array_push(&cp.args, "clone");
457 argv_array_push(&cp.args, "--no-checkout");
458 if (quiet)
459 argv_array_push(&cp.args, "--quiet");
72c5f883
JK
460 if (progress)
461 argv_array_push(&cp.args, "--progress");
ee8838d1
SB
462 if (depth && *depth)
463 argv_array_pushl(&cp.args, "--depth", depth, NULL);
965dbea0
SB
464 if (reference->nr) {
465 struct string_list_item *item;
466 for_each_string_list_item(item, reference)
467 argv_array_pushl(&cp.args, "--reference",
468 item->string, NULL);
469 }
ee8838d1
SB
470 if (gitdir && *gitdir)
471 argv_array_pushl(&cp.args, "--separate-git-dir", gitdir, NULL);
472
473 argv_array_push(&cp.args, url);
474 argv_array_push(&cp.args, path);
475
476 cp.git_cmd = 1;
14111fc4 477 prepare_submodule_repo_env(&cp.env_array);
ee8838d1
SB
478 cp.no_stdin = 1;
479
480 return run_command(&cp);
481}
482
31224cbd
SB
483struct submodule_alternate_setup {
484 const char *submodule_name;
485 enum SUBMODULE_ALTERNATE_ERROR_MODE {
486 SUBMODULE_ALTERNATE_ERROR_DIE,
487 SUBMODULE_ALTERNATE_ERROR_INFO,
488 SUBMODULE_ALTERNATE_ERROR_IGNORE
489 } error_mode;
490 struct string_list *reference;
491};
492#define SUBMODULE_ALTERNATE_SETUP_INIT { NULL, \
493 SUBMODULE_ALTERNATE_ERROR_IGNORE, NULL }
494
495static int add_possible_reference_from_superproject(
496 struct alternate_object_database *alt, void *sas_cb)
497{
498 struct submodule_alternate_setup *sas = sas_cb;
499
31224cbd
SB
500 /*
501 * If the alternate object store is another repository, try the
502 * standard layout with .git/modules/<name>/objects
503 */
597f9134 504 if (ends_with(alt->path, ".git/objects")) {
31224cbd
SB
505 char *sm_alternate;
506 struct strbuf sb = STRBUF_INIT;
507 struct strbuf err = STRBUF_INIT;
597f9134
JK
508 strbuf_add(&sb, alt->path, strlen(alt->path) - strlen("objects"));
509
31224cbd
SB
510 /*
511 * We need to end the new path with '/' to mark it as a dir,
512 * otherwise a submodule name containing '/' will be broken
513 * as the last part of a missing submodule reference would
514 * be taken as a file name.
515 */
516 strbuf_addf(&sb, "modules/%s/", sas->submodule_name);
517
518 sm_alternate = compute_alternate_path(sb.buf, &err);
519 if (sm_alternate) {
520 string_list_append(sas->reference, xstrdup(sb.buf));
521 free(sm_alternate);
522 } else {
523 switch (sas->error_mode) {
524 case SUBMODULE_ALTERNATE_ERROR_DIE:
525 die(_("submodule '%s' cannot add alternate: %s"),
526 sas->submodule_name, err.buf);
527 case SUBMODULE_ALTERNATE_ERROR_INFO:
528 fprintf(stderr, _("submodule '%s' cannot add alternate: %s"),
529 sas->submodule_name, err.buf);
530 case SUBMODULE_ALTERNATE_ERROR_IGNORE:
531 ; /* nothing */
532 }
533 }
534 strbuf_release(&sb);
535 }
536
31224cbd
SB
537 return 0;
538}
539
540static void prepare_possible_alternates(const char *sm_name,
541 struct string_list *reference)
542{
543 char *sm_alternate = NULL, *error_strategy = NULL;
544 struct submodule_alternate_setup sas = SUBMODULE_ALTERNATE_SETUP_INIT;
545
546 git_config_get_string("submodule.alternateLocation", &sm_alternate);
547 if (!sm_alternate)
548 return;
549
550 git_config_get_string("submodule.alternateErrorStrategy", &error_strategy);
551
552 if (!error_strategy)
553 error_strategy = xstrdup("die");
554
555 sas.submodule_name = sm_name;
556 sas.reference = reference;
557 if (!strcmp(error_strategy, "die"))
558 sas.error_mode = SUBMODULE_ALTERNATE_ERROR_DIE;
559 else if (!strcmp(error_strategy, "info"))
560 sas.error_mode = SUBMODULE_ALTERNATE_ERROR_INFO;
561 else if (!strcmp(error_strategy, "ignore"))
562 sas.error_mode = SUBMODULE_ALTERNATE_ERROR_IGNORE;
563 else
564 die(_("Value '%s' for submodule.alternateErrorStrategy is not recognized"), error_strategy);
565
566 if (!strcmp(sm_alternate, "superproject"))
567 foreach_alt_odb(add_possible_reference_from_superproject, &sas);
568 else if (!strcmp(sm_alternate, "no"))
569 ; /* do nothing */
570 else
571 die(_("Value '%s' for submodule.alternateLocation is not recognized"), sm_alternate);
572
573 free(sm_alternate);
574 free(error_strategy);
575}
576
ee8838d1
SB
577static int module_clone(int argc, const char **argv, const char *prefix)
578{
965dbea0 579 const char *name = NULL, *url = NULL, *depth = NULL;
ee8838d1 580 int quiet = 0;
72c5f883 581 int progress = 0;
ee8838d1 582 FILE *submodule_dot_git;
1ea4d9b7 583 char *p, *path = NULL, *sm_gitdir;
ee8838d1
SB
584 struct strbuf rel_path = STRBUF_INIT;
585 struct strbuf sb = STRBUF_INIT;
965dbea0 586 struct string_list reference = STRING_LIST_INIT_NODUP;
ee8838d1
SB
587
588 struct option module_clone_options[] = {
589 OPT_STRING(0, "prefix", &prefix,
590 N_("path"),
591 N_("alternative anchor for relative paths")),
592 OPT_STRING(0, "path", &path,
593 N_("path"),
594 N_("where the new submodule will be cloned to")),
595 OPT_STRING(0, "name", &name,
596 N_("string"),
597 N_("name of the new submodule")),
598 OPT_STRING(0, "url", &url,
599 N_("string"),
600 N_("url where to clone the submodule from")),
965dbea0
SB
601 OPT_STRING_LIST(0, "reference", &reference,
602 N_("repo"),
ee8838d1
SB
603 N_("reference repository")),
604 OPT_STRING(0, "depth", &depth,
605 N_("string"),
606 N_("depth for shallow clones")),
607 OPT__QUIET(&quiet, "Suppress output for cloning a submodule"),
72c5f883
JK
608 OPT_BOOL(0, "progress", &progress,
609 N_("force cloning progress")),
ee8838d1
SB
610 OPT_END()
611 };
612
613 const char *const git_submodule_helper_usage[] = {
614 N_("git submodule--helper clone [--prefix=<path>] [--quiet] "
7dad2633
JK
615 "[--reference <repository>] [--name <name>] [--depth <depth>] "
616 "--url <url> --path <path>"),
ee8838d1
SB
617 NULL
618 };
619
620 argc = parse_options(argc, argv, prefix, module_clone_options,
621 git_submodule_helper_usage, 0);
622
deef3cdc 623 if (argc || !url || !path || !*path)
08e0970a
JK
624 usage_with_options(git_submodule_helper_usage,
625 module_clone_options);
626
ee8838d1 627 strbuf_addf(&sb, "%s/modules/%s", get_git_dir(), name);
1ea4d9b7
JH
628 sm_gitdir = xstrdup(absolute_path(sb.buf));
629 strbuf_reset(&sb);
f8eaa0ba
SB
630
631 if (!is_absolute_path(path)) {
632 strbuf_addf(&sb, "%s/%s", get_git_work_tree(), path);
633 path = strbuf_detach(&sb, NULL);
634 } else
635 path = xstrdup(path);
ee8838d1
SB
636
637 if (!file_exists(sm_gitdir)) {
638 if (safe_create_leading_directories_const(sm_gitdir) < 0)
639 die(_("could not create directory '%s'"), sm_gitdir);
31224cbd
SB
640
641 prepare_possible_alternates(name, &reference);
642
72c5f883
JK
643 if (clone_submodule(path, sm_gitdir, url, depth, &reference,
644 quiet, progress))
ee8838d1
SB
645 die(_("clone of '%s' into submodule path '%s' failed"),
646 url, path);
647 } else {
648 if (safe_create_leading_directories_const(path) < 0)
649 die(_("could not create directory '%s'"), path);
650 strbuf_addf(&sb, "%s/index", sm_gitdir);
651 unlink_or_warn(sb.buf);
652 strbuf_reset(&sb);
653 }
654
655 /* Write a .git file in the submodule to redirect to the superproject. */
3c0663e1 656 strbuf_addf(&sb, "%s/.git", path);
ee8838d1
SB
657 if (safe_create_leading_directories_const(sb.buf) < 0)
658 die(_("could not create leading directories of '%s'"), sb.buf);
659 submodule_dot_git = fopen(sb.buf, "w");
660 if (!submodule_dot_git)
661 die_errno(_("cannot open file '%s'"), sb.buf);
662
1f15ba1f
SB
663 fprintf_or_die(submodule_dot_git, "gitdir: %s\n",
664 relative_path(sm_gitdir, path, &rel_path));
ee8838d1
SB
665 if (fclose(submodule_dot_git))
666 die(_("could not close file %s"), sb.buf);
667 strbuf_reset(&sb);
668 strbuf_reset(&rel_path);
669
ee8838d1 670 /* Redirect the worktree of the submodule in the superproject's config */
ee8838d1
SB
671 p = git_pathdup_submodule(path, "config");
672 if (!p)
673 die(_("could not get submodule directory for '%s'"), path);
674 git_config_set_in_file(p, "core.worktree",
f8eaa0ba 675 relative_path(path, sm_gitdir, &rel_path));
ee8838d1
SB
676 strbuf_release(&sb);
677 strbuf_release(&rel_path);
678 free(sm_gitdir);
f8eaa0ba 679 free(path);
ee8838d1
SB
680 free(p);
681 return 0;
682}
74703a1e 683
48308681
SB
684struct submodule_update_clone {
685 /* index into 'list', the list of submodules to look into for cloning */
686 int current;
687 struct module_list list;
688 unsigned warn_if_uninitialized : 1;
689
690 /* update parameter passed via commandline */
691 struct submodule_update_strategy update;
692
693 /* configuration parameters which are passed on to the children */
72c5f883 694 int progress;
48308681 695 int quiet;
abed000a 696 int recommend_shallow;
5f50f33e 697 struct string_list references;
48308681
SB
698 const char *depth;
699 const char *recursive_prefix;
700 const char *prefix;
701
702 /* Machine-readable status lines to be consumed by git-submodule.sh */
703 struct string_list projectlines;
704
705 /* If we want to stop as fast as possible and return an error */
706 unsigned quickstop : 1;
665b35ec
SB
707
708 /* failed clones to be retried again */
709 const struct cache_entry **failed_clones;
710 int failed_clones_nr, failed_clones_alloc;
48308681
SB
711};
712#define SUBMODULE_UPDATE_CLONE_INIT {0, MODULE_LIST_INIT, 0, \
72c5f883 713 SUBMODULE_UPDATE_STRATEGY_INIT, 0, 0, -1, STRING_LIST_INIT_DUP, \
5f50f33e 714 NULL, NULL, NULL, \
665b35ec 715 STRING_LIST_INIT_DUP, 0, NULL, 0, 0}
48308681 716
08fdbdb1
SB
717
718static void next_submodule_warn_missing(struct submodule_update_clone *suc,
719 struct strbuf *out, const char *displaypath)
720{
721 /*
722 * Only mention uninitialized submodules when their
723 * paths have been specified.
724 */
725 if (suc->warn_if_uninitialized) {
726 strbuf_addf(out,
727 _("Submodule path '%s' not initialized"),
728 displaypath);
729 strbuf_addch(out, '\n');
730 strbuf_addstr(out,
731 _("Maybe you want to use 'update --init'?"));
732 strbuf_addch(out, '\n');
733 }
734}
735
48308681
SB
736/**
737 * Determine whether 'ce' needs to be cloned. If so, prepare the 'child' to
738 * run the clone. Returns 1 if 'ce' needs to be cloned, 0 otherwise.
739 */
740static int prepare_to_clone_next_submodule(const struct cache_entry *ce,
741 struct child_process *child,
742 struct submodule_update_clone *suc,
743 struct strbuf *out)
744{
745 const struct submodule *sub = NULL;
746 struct strbuf displaypath_sb = STRBUF_INIT;
747 struct strbuf sb = STRBUF_INIT;
748 const char *displaypath = NULL;
749 char *url = NULL;
750 int needs_cloning = 0;
751
752 if (ce_stage(ce)) {
753 if (suc->recursive_prefix)
754 strbuf_addf(&sb, "%s/%s", suc->recursive_prefix, ce->name);
755 else
92d52fab 756 strbuf_addstr(&sb, ce->name);
48308681
SB
757 strbuf_addf(out, _("Skipping unmerged submodule %s"), sb.buf);
758 strbuf_addch(out, '\n');
759 goto cleanup;
760 }
761
762 sub = submodule_from_path(null_sha1, ce->name);
763
764 if (suc->recursive_prefix)
765 displaypath = relative_path(suc->recursive_prefix,
766 ce->name, &displaypath_sb);
767 else
768 displaypath = ce->name;
769
08fdbdb1
SB
770 if (!sub) {
771 next_submodule_warn_missing(suc, out, displaypath);
772 goto cleanup;
773 }
774
48308681
SB
775 if (suc->update.type == SM_UPDATE_NONE
776 || (suc->update.type == SM_UPDATE_UNSPECIFIED
777 && sub->update_strategy.type == SM_UPDATE_NONE)) {
778 strbuf_addf(out, _("Skipping submodule '%s'"), displaypath);
779 strbuf_addch(out, '\n');
780 goto cleanup;
781 }
782
783 /*
784 * Looking up the url in .git/config.
785 * We must not fall back to .gitmodules as we only want
786 * to process configured submodules.
787 */
788 strbuf_reset(&sb);
789 strbuf_addf(&sb, "submodule.%s.url", sub->name);
790 git_config_get_string(sb.buf, &url);
791 if (!url) {
08fdbdb1 792 next_submodule_warn_missing(suc, out, displaypath);
48308681
SB
793 goto cleanup;
794 }
795
796 strbuf_reset(&sb);
797 strbuf_addf(&sb, "%s/.git", ce->name);
798 needs_cloning = !file_exists(sb.buf);
799
800 strbuf_reset(&sb);
801 strbuf_addf(&sb, "%06o %s %d %d\t%s\n", ce->ce_mode,
99d1a986 802 oid_to_hex(&ce->oid), ce_stage(ce),
48308681
SB
803 needs_cloning, ce->name);
804 string_list_append(&suc->projectlines, sb.buf);
805
806 if (!needs_cloning)
807 goto cleanup;
808
809 child->git_cmd = 1;
810 child->no_stdin = 1;
811 child->stdout_to_stderr = 1;
812 child->err = -1;
813 argv_array_push(&child->args, "submodule--helper");
814 argv_array_push(&child->args, "clone");
72c5f883
JK
815 if (suc->progress)
816 argv_array_push(&child->args, "--progress");
48308681
SB
817 if (suc->quiet)
818 argv_array_push(&child->args, "--quiet");
819 if (suc->prefix)
820 argv_array_pushl(&child->args, "--prefix", suc->prefix, NULL);
abed000a
SB
821 if (suc->recommend_shallow && sub->recommend_shallow == 1)
822 argv_array_push(&child->args, "--depth=1");
48308681
SB
823 argv_array_pushl(&child->args, "--path", sub->path, NULL);
824 argv_array_pushl(&child->args, "--name", sub->name, NULL);
825 argv_array_pushl(&child->args, "--url", url, NULL);
5f50f33e
SB
826 if (suc->references.nr) {
827 struct string_list_item *item;
828 for_each_string_list_item(item, &suc->references)
829 argv_array_pushl(&child->args, "--reference", item->string, NULL);
830 }
48308681
SB
831 if (suc->depth)
832 argv_array_push(&child->args, suc->depth);
833
834cleanup:
835 free(url);
836 strbuf_reset(&displaypath_sb);
837 strbuf_reset(&sb);
838
839 return needs_cloning;
840}
841
842static int update_clone_get_next_task(struct child_process *child,
843 struct strbuf *err,
844 void *suc_cb,
665b35ec 845 void **idx_task_cb)
48308681
SB
846{
847 struct submodule_update_clone *suc = suc_cb;
665b35ec
SB
848 const struct cache_entry *ce;
849 int index;
48308681
SB
850
851 for (; suc->current < suc->list.nr; suc->current++) {
665b35ec 852 ce = suc->list.entries[suc->current];
48308681 853 if (prepare_to_clone_next_submodule(ce, child, suc, err)) {
665b35ec
SB
854 int *p = xmalloc(sizeof(*p));
855 *p = suc->current;
856 *idx_task_cb = p;
48308681
SB
857 suc->current++;
858 return 1;
859 }
860 }
665b35ec
SB
861
862 /*
863 * The loop above tried cloning each submodule once, now try the
864 * stragglers again, which we can imagine as an extension of the
865 * entry list.
866 */
867 index = suc->current - suc->list.nr;
868 if (index < suc->failed_clones_nr) {
869 int *p;
870 ce = suc->failed_clones[index];
2201ee09
SB
871 if (!prepare_to_clone_next_submodule(ce, child, suc, err)) {
872 suc->current ++;
a22ae753
RS
873 strbuf_addstr(err, "BUG: submodule considered for "
874 "cloning, doesn't need cloning "
875 "any more?\n");
2201ee09
SB
876 return 0;
877 }
665b35ec
SB
878 p = xmalloc(sizeof(*p));
879 *p = suc->current;
880 *idx_task_cb = p;
881 suc->current ++;
882 return 1;
883 }
884
48308681
SB
885 return 0;
886}
887
888static int update_clone_start_failure(struct strbuf *err,
889 void *suc_cb,
665b35ec 890 void *idx_task_cb)
48308681
SB
891{
892 struct submodule_update_clone *suc = suc_cb;
893 suc->quickstop = 1;
894 return 1;
895}
896
897static int update_clone_task_finished(int result,
898 struct strbuf *err,
899 void *suc_cb,
665b35ec 900 void *idx_task_cb)
48308681 901{
665b35ec 902 const struct cache_entry *ce;
48308681
SB
903 struct submodule_update_clone *suc = suc_cb;
904
665b35ec
SB
905 int *idxP = *(int**)idx_task_cb;
906 int idx = *idxP;
907 free(idxP);
908
48308681
SB
909 if (!result)
910 return 0;
911
665b35ec
SB
912 if (idx < suc->list.nr) {
913 ce = suc->list.entries[idx];
914 strbuf_addf(err, _("Failed to clone '%s'. Retry scheduled"),
915 ce->name);
916 strbuf_addch(err, '\n');
917 ALLOC_GROW(suc->failed_clones,
918 suc->failed_clones_nr + 1,
919 suc->failed_clones_alloc);
920 suc->failed_clones[suc->failed_clones_nr++] = ce;
921 return 0;
922 } else {
eb09121b 923 idx -= suc->list.nr;
665b35ec
SB
924 ce = suc->failed_clones[idx];
925 strbuf_addf(err, _("Failed to clone '%s' a second time, aborting"),
926 ce->name);
927 strbuf_addch(err, '\n');
928 suc->quickstop = 1;
929 return 1;
930 }
931
932 return 0;
48308681
SB
933}
934
935static int update_clone(int argc, const char **argv, const char *prefix)
936{
937 const char *update = NULL;
2335b870 938 int max_jobs = -1;
48308681
SB
939 struct string_list_item *item;
940 struct pathspec pathspec;
941 struct submodule_update_clone suc = SUBMODULE_UPDATE_CLONE_INIT;
942
943 struct option module_update_clone_options[] = {
944 OPT_STRING(0, "prefix", &prefix,
945 N_("path"),
946 N_("path into the working tree")),
947 OPT_STRING(0, "recursive-prefix", &suc.recursive_prefix,
948 N_("path"),
949 N_("path into the working tree, across nested "
950 "submodule boundaries")),
951 OPT_STRING(0, "update", &update,
952 N_("string"),
953 N_("rebase, merge, checkout or none")),
5f50f33e 954 OPT_STRING_LIST(0, "reference", &suc.references, N_("repo"),
48308681
SB
955 N_("reference repository")),
956 OPT_STRING(0, "depth", &suc.depth, "<depth>",
957 N_("Create a shallow clone truncated to the "
958 "specified number of revisions")),
2335b870
SB
959 OPT_INTEGER('j', "jobs", &max_jobs,
960 N_("parallel jobs")),
abed000a
SB
961 OPT_BOOL(0, "recommend-shallow", &suc.recommend_shallow,
962 N_("whether the initial clone should follow the shallow recommendation")),
48308681 963 OPT__QUIET(&suc.quiet, N_("don't print cloning progress")),
72c5f883
JK
964 OPT_BOOL(0, "progress", &suc.progress,
965 N_("force cloning progress")),
48308681
SB
966 OPT_END()
967 };
968
969 const char *const git_submodule_helper_usage[] = {
970 N_("git submodule--helper update_clone [--prefix=<path>] [<path>...]"),
971 NULL
972 };
973 suc.prefix = prefix;
974
975 argc = parse_options(argc, argv, prefix, module_update_clone_options,
976 git_submodule_helper_usage, 0);
977
978 if (update)
979 if (parse_submodule_update_strategy(update, &suc.update) < 0)
980 die(_("bad value for update parameter"));
981
982 if (module_list_compute(argc, argv, prefix, &pathspec, &suc.list) < 0)
983 return 1;
984
985 if (pathspec.nr)
986 suc.warn_if_uninitialized = 1;
987
988 /* Overlay the parsed .gitmodules file with .git/config */
989 gitmodules_config();
990 git_config(submodule_config, NULL);
991
2335b870
SB
992 if (max_jobs < 0)
993 max_jobs = parallel_submodules();
994
995 run_processes_parallel(max_jobs,
48308681
SB
996 update_clone_get_next_task,
997 update_clone_start_failure,
998 update_clone_task_finished,
999 &suc);
1000
1001 /*
1002 * We saved the output and put it out all at once now.
1003 * That means:
1004 * - the listener does not have to interleave their (checkout)
1005 * work with our fetching. The writes involved in a
1006 * checkout involve more straightforward sequential I/O.
1007 * - the listener can avoid doing any work if fetching failed.
1008 */
1009 if (suc.quickstop)
1010 return 1;
1011
1012 for_each_string_list_item(item, &suc.projectlines)
1013 utf8_fprintf(stdout, "%s", item->string);
1014
1015 return 0;
1016}
1017
44431df0
SB
1018static int resolve_relative_path(int argc, const char **argv, const char *prefix)
1019{
1020 struct strbuf sb = STRBUF_INIT;
1021 if (argc != 3)
2de26ae1 1022 die("submodule--helper relative-path takes exactly 2 arguments, got %d", argc);
44431df0
SB
1023
1024 printf("%s", relative_path(argv[1], argv[2], &sb));
1025 strbuf_release(&sb);
1026 return 0;
1027}
1028
92bbe7cc
SB
1029static const char *remote_submodule_branch(const char *path)
1030{
1031 const struct submodule *sub;
1032 gitmodules_config();
1033 git_config(submodule_config, NULL);
1034
1035 sub = submodule_from_path(null_sha1, path);
1036 if (!sub)
1037 return NULL;
1038
1039 if (!sub->branch)
1040 return "master";
1041
4d7bc52b
SB
1042 if (!strcmp(sub->branch, ".")) {
1043 unsigned char sha1[20];
1044 const char *refname = resolve_ref_unsafe("HEAD", 0, sha1, NULL);
1045
1046 if (!refname)
1047 die(_("No such ref: %s"), "HEAD");
1048
1049 /* detached HEAD */
1050 if (!strcmp(refname, "HEAD"))
1051 die(_("Submodule (%s) branch configured to inherit "
1052 "branch from superproject, but the superproject "
1053 "is not on any branch"), sub->name);
1054
1055 if (!skip_prefix(refname, "refs/heads/", &refname))
1056 die(_("Expecting a full ref name, got %s"), refname);
1057 return refname;
1058 }
1059
92bbe7cc
SB
1060 return sub->branch;
1061}
1062
1063static int resolve_remote_submodule_branch(int argc, const char **argv,
1064 const char *prefix)
1065{
1066 const char *ret;
1067 struct strbuf sb = STRBUF_INIT;
1068 if (argc != 2)
1069 die("submodule--helper remote-branch takes exactly one arguments, got %d", argc);
1070
1071 ret = remote_submodule_branch(argv[1]);
1072 if (!ret)
1073 die("submodule %s doesn't exist", argv[1]);
1074
1075 printf("%s", ret);
1076 strbuf_release(&sb);
1077 return 0;
1078}
1079
f6f85861
SB
1080static int absorb_git_dirs(int argc, const char **argv, const char *prefix)
1081{
1082 int i;
1083 struct pathspec pathspec;
1084 struct module_list list = MODULE_LIST_INIT;
1085 unsigned flags = ABSORB_GITDIR_RECURSE_SUBMODULES;
1086
1087 struct option embed_gitdir_options[] = {
1088 OPT_STRING(0, "prefix", &prefix,
1089 N_("path"),
1090 N_("path into the working tree")),
1091 OPT_BIT(0, "--recursive", &flags, N_("recurse into submodules"),
1092 ABSORB_GITDIR_RECURSE_SUBMODULES),
1093 OPT_END()
1094 };
1095
1096 const char *const git_submodule_helper_usage[] = {
1097 N_("git submodule--helper embed-git-dir [<path>...]"),
1098 NULL
1099 };
1100
1101 argc = parse_options(argc, argv, prefix, embed_gitdir_options,
1102 git_submodule_helper_usage, 0);
1103
1104 gitmodules_config();
1105 git_config(submodule_config, NULL);
1106
1107 if (module_list_compute(argc, argv, prefix, &pathspec, &list) < 0)
1108 return 1;
1109
1110 for (i = 0; i < list.nr; i++)
1111 absorb_git_dir_into_superproject(prefix,
1112 list.entries[i]->name, flags);
1113
1114 return 0;
1115}
1116
89c86265
SB
1117#define SUPPORT_SUPER_PREFIX (1<<0)
1118
74703a1e
SB
1119struct cmd_struct {
1120 const char *cmd;
1121 int (*fn)(int, const char **, const char *);
89c86265 1122 unsigned option;
74703a1e
SB
1123};
1124
1125static struct cmd_struct commands[] = {
89c86265
SB
1126 {"list", module_list, 0},
1127 {"name", module_name, 0},
1128 {"clone", module_clone, 0},
1129 {"update-clone", update_clone, 0},
1130 {"relative-path", resolve_relative_path, 0},
1131 {"resolve-relative-url", resolve_relative_url, 0},
1132 {"resolve-relative-url-test", resolve_relative_url_test, 0},
6e7c14e6 1133 {"init", module_init, SUPPORT_SUPER_PREFIX},
89c86265 1134 {"remote-branch", resolve_remote_submodule_branch, 0},
f6f85861 1135 {"absorb-git-dirs", absorb_git_dirs, SUPPORT_SUPER_PREFIX},
74703a1e
SB
1136};
1137
1138int cmd_submodule__helper(int argc, const char **argv, const char *prefix)
1139{
1140 int i;
1141 if (argc < 2)
cdc04b65 1142 die(_("submodule--helper subcommand must be "
74703a1e
SB
1143 "called with a subcommand"));
1144
89c86265
SB
1145 for (i = 0; i < ARRAY_SIZE(commands); i++) {
1146 if (!strcmp(argv[1], commands[i].cmd)) {
1147 if (get_super_prefix() &&
1148 !(commands[i].option & SUPPORT_SUPER_PREFIX))
1149 die(_("%s doesn't support --super-prefix"),
1150 commands[i].cmd);
74703a1e 1151 return commands[i].fn(argc - 1, argv + 1, prefix);
89c86265
SB
1152 }
1153 }
74703a1e 1154
cdc04b65 1155 die(_("'%s' is not a valid submodule--helper "
74703a1e
SB
1156 "subcommand"), argv[1]);
1157}