2 #include "repository.h"
5 #include "parse-options.h"
10 #include "submodule-config.h"
11 #include "string-list.h"
12 #include "run-command.h"
17 static char *get_default_remote(void)
19 char *dest
= NULL
, *ret
;
20 unsigned char sha1
[20];
21 struct strbuf sb
= STRBUF_INIT
;
22 const char *refname
= resolve_ref_unsafe("HEAD", 0, sha1
, NULL
);
25 die(_("No such ref: %s"), "HEAD");
28 if (!strcmp(refname
, "HEAD"))
29 return xstrdup("origin");
31 if (!skip_prefix(refname
, "refs/heads/", &refname
))
32 die(_("Expecting a full ref name, got %s"), refname
);
34 strbuf_addf(&sb
, "branch.%s.remote", refname
);
35 if (git_config_get_string(sb
.buf
, &dest
))
36 ret
= xstrdup("origin");
44 static int starts_with_dot_slash(const char *str
)
46 return str
[0] == '.' && is_dir_sep(str
[1]);
49 static int starts_with_dot_dot_slash(const char *str
)
51 return str
[0] == '.' && str
[1] == '.' && is_dir_sep(str
[2]);
55 * Returns 1 if it was the last chop before ':'.
57 static int chop_last_dir(char **remoteurl
, int is_relative
)
59 char *rfind
= find_last_dir_sep(*remoteurl
);
65 rfind
= strrchr(*remoteurl
, ':');
71 if (is_relative
|| !strcmp(".", *remoteurl
))
72 die(_("cannot strip one component off url '%s'"),
76 *remoteurl
= xstrdup(".");
81 * The `url` argument is the URL that navigates to the submodule origin
82 * repo. When relative, this URL is relative to the superproject origin
83 * URL repo. The `up_path` argument, if specified, is the relative
84 * path that navigates from the submodule working tree to the superproject
85 * working tree. Returns the origin URL of the submodule.
87 * Return either an absolute URL or filesystem path (if the superproject
88 * origin URL is an absolute URL or filesystem path, respectively) or a
89 * relative file system path (if the superproject origin URL is a relative
92 * When the output is a relative file system path, the path is either
93 * relative to the submodule working tree, if up_path is specified, or to
94 * the superproject working tree otherwise.
96 * NEEDSWORK: This works incorrectly on the domain and protocol part.
97 * remote_url url outcome expectation
98 * http://a.com/b ../c http://a.com/c as is
99 * http://a.com/b/ ../c http://a.com/c same as previous line, but
100 * ignore trailing slash in url
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 http:c error out
104 * http://a.com/b ../../../../../c .:c error out
105 * NEEDSWORK: Given how chop_last_dir() works, this function is broken
106 * when a local part has a colon in its path component, too.
108 static char *relative_url(const char *remote_url
,
115 char *remoteurl
= xstrdup(remote_url
);
116 struct strbuf sb
= STRBUF_INIT
;
117 size_t len
= strlen(remoteurl
);
119 if (is_dir_sep(remoteurl
[len
-1]))
120 remoteurl
[len
-1] = '\0';
122 if (!url_is_local_not_ssh(remoteurl
) || is_absolute_path(remoteurl
))
127 * Prepend a './' to ensure all relative
128 * remoteurls start with './' or '../'
130 if (!starts_with_dot_slash(remoteurl
) &&
131 !starts_with_dot_dot_slash(remoteurl
)) {
133 strbuf_addf(&sb
, "./%s", remoteurl
);
135 remoteurl
= strbuf_detach(&sb
, NULL
);
139 * When the url starts with '../', remove that and the
140 * last directory in remoteurl.
143 if (starts_with_dot_dot_slash(url
)) {
145 colonsep
|= chop_last_dir(&remoteurl
, is_relative
);
146 } else if (starts_with_dot_slash(url
))
152 strbuf_addf(&sb
, "%s%s%s", remoteurl
, colonsep
? ":" : "/", url
);
153 if (ends_with(url
, "/"))
154 strbuf_setlen(&sb
, sb
.len
- 1);
157 if (starts_with_dot_slash(sb
.buf
))
158 out
= xstrdup(sb
.buf
+ 2);
160 out
= xstrdup(sb
.buf
);
163 if (!up_path
|| !is_relative
)
166 strbuf_addf(&sb
, "%s%s", up_path
, out
);
168 return strbuf_detach(&sb
, NULL
);
171 static int resolve_relative_url(int argc
, const char **argv
, const char *prefix
)
173 char *remoteurl
= NULL
;
174 char *remote
= get_default_remote();
175 const char *up_path
= NULL
;
178 struct strbuf sb
= STRBUF_INIT
;
180 if (argc
!= 2 && argc
!= 3)
181 die("resolve-relative-url only accepts one or two arguments");
184 strbuf_addf(&sb
, "remote.%s.url", remote
);
187 if (git_config_get_string(sb
.buf
, &remoteurl
))
188 /* the repository is its own authoritative upstream */
189 remoteurl
= xgetcwd();
194 res
= relative_url(remoteurl
, url
, up_path
);
201 static int resolve_relative_url_test(int argc
, const char **argv
, const char *prefix
)
203 char *remoteurl
, *res
;
204 const char *up_path
, *url
;
207 die("resolve-relative-url-test only accepts three arguments: <up_path> <remoteurl> <url>");
210 remoteurl
= xstrdup(argv
[2]);
213 if (!strcmp(up_path
, "(null)"))
216 res
= relative_url(remoteurl
, url
, up_path
);
224 const struct cache_entry
**entries
;
227 #define MODULE_LIST_INIT { NULL, 0, 0 }
229 static int module_list_compute(int argc
, const char **argv
,
231 struct pathspec
*pathspec
,
232 struct module_list
*list
)
235 char *ps_matched
= NULL
;
236 parse_pathspec(pathspec
, 0,
237 PATHSPEC_PREFER_FULL
,
241 ps_matched
= xcalloc(pathspec
->nr
, 1);
243 if (read_cache() < 0)
244 die(_("index file corrupt"));
246 for (i
= 0; i
< active_nr
; i
++) {
247 const struct cache_entry
*ce
= active_cache
[i
];
249 if (!match_pathspec(pathspec
, ce
->name
, ce_namelen(ce
),
251 !S_ISGITLINK(ce
->ce_mode
))
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
))
259 * Skip entries with the same name in different stages
260 * to make sure an entry is returned only once.
265 if (ps_matched
&& report_path_error(ps_matched
, pathspec
, prefix
))
273 static void module_list_active(struct module_list
*list
)
276 struct module_list active_modules
= MODULE_LIST_INIT
;
280 for (i
= 0; i
< list
->nr
; i
++) {
281 const struct cache_entry
*ce
= list
->entries
[i
];
283 if (!is_submodule_active(the_repository
, ce
->name
))
286 ALLOC_GROW(active_modules
.entries
,
287 active_modules
.nr
+ 1,
288 active_modules
.alloc
);
289 active_modules
.entries
[active_modules
.nr
++] = ce
;
293 *list
= active_modules
;
296 static int module_list(int argc
, const char **argv
, const char *prefix
)
299 struct pathspec pathspec
;
300 struct module_list list
= MODULE_LIST_INIT
;
302 struct option module_list_options
[] = {
303 OPT_STRING(0, "prefix", &prefix
,
305 N_("alternative anchor for relative paths")),
309 const char *const git_submodule_helper_usage
[] = {
310 N_("git submodule--helper list [--prefix=<path>] [<path>...]"),
314 argc
= parse_options(argc
, argv
, prefix
, module_list_options
,
315 git_submodule_helper_usage
, 0);
317 if (module_list_compute(argc
, argv
, prefix
, &pathspec
, &list
) < 0)
320 for (i
= 0; i
< list
.nr
; i
++) {
321 const struct cache_entry
*ce
= list
.entries
[i
];
324 printf("%06o %s U\t", ce
->ce_mode
, sha1_to_hex(null_sha1
));
326 printf("%06o %s %d\t", ce
->ce_mode
,
327 oid_to_hex(&ce
->oid
), ce_stage(ce
));
329 fprintf(stdout
, "%s\n", ce
->name
);
334 static void init_submodule(const char *path
, const char *prefix
, int quiet
)
336 const struct submodule
*sub
;
337 struct strbuf sb
= STRBUF_INIT
;
338 char *upd
= NULL
, *url
= NULL
, *displaypath
;
340 /* Only loads from .gitmodules, no overlay with .git/config */
343 if (prefix
&& get_super_prefix())
344 die("BUG: cannot have prefix and superprefix");
346 displaypath
= xstrdup(relative_path(path
, prefix
, &sb
));
347 else if (get_super_prefix()) {
348 strbuf_addf(&sb
, "%s%s", get_super_prefix(), path
);
349 displaypath
= strbuf_detach(&sb
, NULL
);
351 displaypath
= xstrdup(path
);
353 sub
= submodule_from_path(null_sha1
, path
);
356 die(_("No url found for submodule path '%s' in .gitmodules"),
360 * NEEDSWORK: In a multi-working-tree world, this needs to be
361 * set in the per-worktree config.
363 * Set active flag for the submodule being initialized
365 if (!is_submodule_active(the_repository
, path
)) {
367 strbuf_addf(&sb
, "submodule.%s.active", sub
->name
);
368 git_config_set_gently(sb
.buf
, "true");
372 * Copy url setting when it is not set yet.
373 * To look up the url in .git/config, we must not fall back to
374 * .gitmodules, so look it up directly.
377 strbuf_addf(&sb
, "submodule.%s.url", sub
->name
);
378 if (git_config_get_string(sb
.buf
, &url
)) {
380 die(_("No url found for submodule path '%s' in .gitmodules"),
383 url
= xstrdup(sub
->url
);
385 /* Possibly a url relative to parent */
386 if (starts_with_dot_dot_slash(url
) ||
387 starts_with_dot_slash(url
)) {
388 char *remoteurl
, *relurl
;
389 char *remote
= get_default_remote();
390 struct strbuf remotesb
= STRBUF_INIT
;
391 strbuf_addf(&remotesb
, "remote.%s.url", remote
);
394 if (git_config_get_string(remotesb
.buf
, &remoteurl
)) {
395 warning(_("could not lookup configuration '%s'. Assuming this repository is its own authoritative upstream."), remotesb
.buf
);
396 remoteurl
= xgetcwd();
398 relurl
= relative_url(remoteurl
, url
, NULL
);
399 strbuf_release(&remotesb
);
405 if (git_config_set_gently(sb
.buf
, url
))
406 die(_("Failed to register url for submodule path '%s'"),
410 _("Submodule '%s' (%s) registered for path '%s'\n"),
411 sub
->name
, url
, displaypath
);
414 /* Copy "update" setting when it is not set yet */
416 strbuf_addf(&sb
, "submodule.%s.update", sub
->name
);
417 if (git_config_get_string(sb
.buf
, &upd
) &&
418 sub
->update_strategy
.type
!= SM_UPDATE_UNSPECIFIED
) {
419 if (sub
->update_strategy
.type
== SM_UPDATE_COMMAND
) {
420 fprintf(stderr
, _("warning: command update mode suggested for submodule '%s'\n"),
422 upd
= xstrdup("none");
424 upd
= xstrdup(submodule_strategy_to_string(&sub
->update_strategy
));
426 if (git_config_set_gently(sb
.buf
, upd
))
427 die(_("Failed to register update mode for submodule path '%s'"), displaypath
);
435 static int module_init(int argc
, const char **argv
, const char *prefix
)
437 struct pathspec pathspec
;
438 struct module_list list
= MODULE_LIST_INIT
;
442 struct option module_init_options
[] = {
443 OPT__QUIET(&quiet
, N_("Suppress output for initializing a submodule")),
447 const char *const git_submodule_helper_usage
[] = {
448 N_("git submodule--helper init [<path>]"),
452 argc
= parse_options(argc
, argv
, prefix
, module_init_options
,
453 git_submodule_helper_usage
, 0);
455 if (module_list_compute(argc
, argv
, prefix
, &pathspec
, &list
) < 0)
459 * If there are no path args and submodule.active is set then,
460 * by default, only initialize 'active' modules.
462 if (!argc
&& git_config_get_value_multi("submodule.active"))
463 module_list_active(&list
);
465 for (i
= 0; i
< list
.nr
; i
++)
466 init_submodule(list
.entries
[i
]->name
, prefix
, quiet
);
471 static int module_name(int argc
, const char **argv
, const char *prefix
)
473 const struct submodule
*sub
;
476 usage(_("git submodule--helper name <path>"));
479 sub
= submodule_from_path(null_sha1
, argv
[1]);
482 die(_("no submodule mapping found in .gitmodules for path '%s'"),
485 printf("%s\n", sub
->name
);
490 static int clone_submodule(const char *path
, const char *gitdir
, const char *url
,
491 const char *depth
, struct string_list
*reference
,
492 int quiet
, int progress
)
494 struct child_process cp
= CHILD_PROCESS_INIT
;
496 argv_array_push(&cp
.args
, "clone");
497 argv_array_push(&cp
.args
, "--no-checkout");
499 argv_array_push(&cp
.args
, "--quiet");
501 argv_array_push(&cp
.args
, "--progress");
503 argv_array_pushl(&cp
.args
, "--depth", depth
, NULL
);
505 struct string_list_item
*item
;
506 for_each_string_list_item(item
, reference
)
507 argv_array_pushl(&cp
.args
, "--reference",
510 if (gitdir
&& *gitdir
)
511 argv_array_pushl(&cp
.args
, "--separate-git-dir", gitdir
, NULL
);
513 argv_array_push(&cp
.args
, url
);
514 argv_array_push(&cp
.args
, path
);
517 prepare_submodule_repo_env(&cp
.env_array
);
520 return run_command(&cp
);
523 struct submodule_alternate_setup
{
524 const char *submodule_name
;
525 enum SUBMODULE_ALTERNATE_ERROR_MODE
{
526 SUBMODULE_ALTERNATE_ERROR_DIE
,
527 SUBMODULE_ALTERNATE_ERROR_INFO
,
528 SUBMODULE_ALTERNATE_ERROR_IGNORE
530 struct string_list
*reference
;
532 #define SUBMODULE_ALTERNATE_SETUP_INIT { NULL, \
533 SUBMODULE_ALTERNATE_ERROR_IGNORE, NULL }
535 static int add_possible_reference_from_superproject(
536 struct alternate_object_database
*alt
, void *sas_cb
)
538 struct submodule_alternate_setup
*sas
= sas_cb
;
541 * If the alternate object store is another repository, try the
542 * standard layout with .git/(modules/<name>)+/objects
544 if (ends_with(alt
->path
, "/objects")) {
546 struct strbuf sb
= STRBUF_INIT
;
547 struct strbuf err
= STRBUF_INIT
;
548 strbuf_add(&sb
, alt
->path
, strlen(alt
->path
) - strlen("objects"));
551 * We need to end the new path with '/' to mark it as a dir,
552 * otherwise a submodule name containing '/' will be broken
553 * as the last part of a missing submodule reference would
554 * be taken as a file name.
556 strbuf_addf(&sb
, "modules/%s/", sas
->submodule_name
);
558 sm_alternate
= compute_alternate_path(sb
.buf
, &err
);
560 string_list_append(sas
->reference
, xstrdup(sb
.buf
));
563 switch (sas
->error_mode
) {
564 case SUBMODULE_ALTERNATE_ERROR_DIE
:
565 die(_("submodule '%s' cannot add alternate: %s"),
566 sas
->submodule_name
, err
.buf
);
567 case SUBMODULE_ALTERNATE_ERROR_INFO
:
568 fprintf(stderr
, _("submodule '%s' cannot add alternate: %s"),
569 sas
->submodule_name
, err
.buf
);
570 case SUBMODULE_ALTERNATE_ERROR_IGNORE
:
580 static void prepare_possible_alternates(const char *sm_name
,
581 struct string_list
*reference
)
583 char *sm_alternate
= NULL
, *error_strategy
= NULL
;
584 struct submodule_alternate_setup sas
= SUBMODULE_ALTERNATE_SETUP_INIT
;
586 git_config_get_string("submodule.alternateLocation", &sm_alternate
);
590 git_config_get_string("submodule.alternateErrorStrategy", &error_strategy
);
593 error_strategy
= xstrdup("die");
595 sas
.submodule_name
= sm_name
;
596 sas
.reference
= reference
;
597 if (!strcmp(error_strategy
, "die"))
598 sas
.error_mode
= SUBMODULE_ALTERNATE_ERROR_DIE
;
599 else if (!strcmp(error_strategy
, "info"))
600 sas
.error_mode
= SUBMODULE_ALTERNATE_ERROR_INFO
;
601 else if (!strcmp(error_strategy
, "ignore"))
602 sas
.error_mode
= SUBMODULE_ALTERNATE_ERROR_IGNORE
;
604 die(_("Value '%s' for submodule.alternateErrorStrategy is not recognized"), error_strategy
);
606 if (!strcmp(sm_alternate
, "superproject"))
607 foreach_alt_odb(add_possible_reference_from_superproject
, &sas
);
608 else if (!strcmp(sm_alternate
, "no"))
611 die(_("Value '%s' for submodule.alternateLocation is not recognized"), sm_alternate
);
614 free(error_strategy
);
617 static int module_clone(int argc
, const char **argv
, const char *prefix
)
619 const char *name
= NULL
, *url
= NULL
, *depth
= NULL
;
622 char *p
, *path
= NULL
, *sm_gitdir
;
623 struct strbuf sb
= STRBUF_INIT
;
624 struct string_list reference
= STRING_LIST_INIT_NODUP
;
625 char *sm_alternate
= NULL
, *error_strategy
= NULL
;
627 struct option module_clone_options
[] = {
628 OPT_STRING(0, "prefix", &prefix
,
630 N_("alternative anchor for relative paths")),
631 OPT_STRING(0, "path", &path
,
633 N_("where the new submodule will be cloned to")),
634 OPT_STRING(0, "name", &name
,
636 N_("name of the new submodule")),
637 OPT_STRING(0, "url", &url
,
639 N_("url where to clone the submodule from")),
640 OPT_STRING_LIST(0, "reference", &reference
,
642 N_("reference repository")),
643 OPT_STRING(0, "depth", &depth
,
645 N_("depth for shallow clones")),
646 OPT__QUIET(&quiet
, "Suppress output for cloning a submodule"),
647 OPT_BOOL(0, "progress", &progress
,
648 N_("force cloning progress")),
652 const char *const git_submodule_helper_usage
[] = {
653 N_("git submodule--helper clone [--prefix=<path>] [--quiet] "
654 "[--reference <repository>] [--name <name>] [--depth <depth>] "
655 "--url <url> --path <path>"),
659 argc
= parse_options(argc
, argv
, prefix
, module_clone_options
,
660 git_submodule_helper_usage
, 0);
662 if (argc
|| !url
|| !path
|| !*path
)
663 usage_with_options(git_submodule_helper_usage
,
664 module_clone_options
);
666 strbuf_addf(&sb
, "%s/modules/%s", get_git_dir(), name
);
667 sm_gitdir
= absolute_pathdup(sb
.buf
);
670 if (!is_absolute_path(path
)) {
671 strbuf_addf(&sb
, "%s/%s", get_git_work_tree(), path
);
672 path
= strbuf_detach(&sb
, NULL
);
674 path
= xstrdup(path
);
676 if (!file_exists(sm_gitdir
)) {
677 if (safe_create_leading_directories_const(sm_gitdir
) < 0)
678 die(_("could not create directory '%s'"), sm_gitdir
);
680 prepare_possible_alternates(name
, &reference
);
682 if (clone_submodule(path
, sm_gitdir
, url
, depth
, &reference
,
684 die(_("clone of '%s' into submodule path '%s' failed"),
687 if (safe_create_leading_directories_const(path
) < 0)
688 die(_("could not create directory '%s'"), path
);
689 strbuf_addf(&sb
, "%s/index", sm_gitdir
);
690 unlink_or_warn(sb
.buf
);
694 /* Connect module worktree and git dir */
695 connect_work_tree_and_git_dir(path
, sm_gitdir
);
697 p
= git_pathdup_submodule(path
, "config");
699 die(_("could not get submodule directory for '%s'"), path
);
701 /* setup alternateLocation and alternateErrorStrategy in the cloned submodule if needed */
702 git_config_get_string("submodule.alternateLocation", &sm_alternate
);
704 git_config_set_in_file(p
, "submodule.alternateLocation",
706 git_config_get_string("submodule.alternateErrorStrategy", &error_strategy
);
708 git_config_set_in_file(p
, "submodule.alternateErrorStrategy",
712 free(error_strategy
);
721 struct submodule_update_clone
{
722 /* index into 'list', the list of submodules to look into for cloning */
724 struct module_list list
;
725 unsigned warn_if_uninitialized
: 1;
727 /* update parameter passed via commandline */
728 struct submodule_update_strategy update
;
730 /* configuration parameters which are passed on to the children */
733 int recommend_shallow
;
734 struct string_list references
;
736 const char *recursive_prefix
;
739 /* Machine-readable status lines to be consumed by git-submodule.sh */
740 struct string_list projectlines
;
742 /* If we want to stop as fast as possible and return an error */
743 unsigned quickstop
: 1;
745 /* failed clones to be retried again */
746 const struct cache_entry
**failed_clones
;
747 int failed_clones_nr
, failed_clones_alloc
;
749 #define SUBMODULE_UPDATE_CLONE_INIT {0, MODULE_LIST_INIT, 0, \
750 SUBMODULE_UPDATE_STRATEGY_INIT, 0, 0, -1, STRING_LIST_INIT_DUP, \
752 STRING_LIST_INIT_DUP, 0, NULL, 0, 0}
755 static void next_submodule_warn_missing(struct submodule_update_clone
*suc
,
756 struct strbuf
*out
, const char *displaypath
)
759 * Only mention uninitialized submodules when their
760 * paths have been specified.
762 if (suc
->warn_if_uninitialized
) {
764 _("Submodule path '%s' not initialized"),
766 strbuf_addch(out
, '\n');
768 _("Maybe you want to use 'update --init'?"));
769 strbuf_addch(out
, '\n');
774 * Determine whether 'ce' needs to be cloned. If so, prepare the 'child' to
775 * run the clone. Returns 1 if 'ce' needs to be cloned, 0 otherwise.
777 static int prepare_to_clone_next_submodule(const struct cache_entry
*ce
,
778 struct child_process
*child
,
779 struct submodule_update_clone
*suc
,
782 const struct submodule
*sub
= NULL
;
783 struct strbuf displaypath_sb
= STRBUF_INIT
;
784 struct strbuf sb
= STRBUF_INIT
;
785 const char *displaypath
= NULL
;
786 int needs_cloning
= 0;
789 if (suc
->recursive_prefix
)
790 strbuf_addf(&sb
, "%s/%s", suc
->recursive_prefix
, ce
->name
);
792 strbuf_addstr(&sb
, ce
->name
);
793 strbuf_addf(out
, _("Skipping unmerged submodule %s"), sb
.buf
);
794 strbuf_addch(out
, '\n');
798 sub
= submodule_from_path(null_sha1
, ce
->name
);
800 if (suc
->recursive_prefix
)
801 displaypath
= relative_path(suc
->recursive_prefix
,
802 ce
->name
, &displaypath_sb
);
804 displaypath
= ce
->name
;
807 next_submodule_warn_missing(suc
, out
, displaypath
);
811 if (suc
->update
.type
== SM_UPDATE_NONE
812 || (suc
->update
.type
== SM_UPDATE_UNSPECIFIED
813 && sub
->update_strategy
.type
== SM_UPDATE_NONE
)) {
814 strbuf_addf(out
, _("Skipping submodule '%s'"), displaypath
);
815 strbuf_addch(out
, '\n');
819 /* Check if the submodule has been initialized. */
820 if (!is_submodule_active(the_repository
, ce
->name
)) {
821 next_submodule_warn_missing(suc
, out
, displaypath
);
826 strbuf_addf(&sb
, "%s/.git", ce
->name
);
827 needs_cloning
= !file_exists(sb
.buf
);
830 strbuf_addf(&sb
, "%06o %s %d %d\t%s\n", ce
->ce_mode
,
831 oid_to_hex(&ce
->oid
), ce_stage(ce
),
832 needs_cloning
, ce
->name
);
833 string_list_append(&suc
->projectlines
, sb
.buf
);
840 child
->stdout_to_stderr
= 1;
842 argv_array_push(&child
->args
, "submodule--helper");
843 argv_array_push(&child
->args
, "clone");
845 argv_array_push(&child
->args
, "--progress");
847 argv_array_push(&child
->args
, "--quiet");
849 argv_array_pushl(&child
->args
, "--prefix", suc
->prefix
, NULL
);
850 if (suc
->recommend_shallow
&& sub
->recommend_shallow
== 1)
851 argv_array_push(&child
->args
, "--depth=1");
852 argv_array_pushl(&child
->args
, "--path", sub
->path
, NULL
);
853 argv_array_pushl(&child
->args
, "--name", sub
->name
, NULL
);
854 argv_array_pushl(&child
->args
, "--url", sub
->url
, NULL
);
855 if (suc
->references
.nr
) {
856 struct string_list_item
*item
;
857 for_each_string_list_item(item
, &suc
->references
)
858 argv_array_pushl(&child
->args
, "--reference", item
->string
, NULL
);
861 argv_array_push(&child
->args
, suc
->depth
);
864 strbuf_reset(&displaypath_sb
);
867 return needs_cloning
;
870 static int update_clone_get_next_task(struct child_process
*child
,
875 struct submodule_update_clone
*suc
= suc_cb
;
876 const struct cache_entry
*ce
;
879 for (; suc
->current
< suc
->list
.nr
; suc
->current
++) {
880 ce
= suc
->list
.entries
[suc
->current
];
881 if (prepare_to_clone_next_submodule(ce
, child
, suc
, err
)) {
882 int *p
= xmalloc(sizeof(*p
));
891 * The loop above tried cloning each submodule once, now try the
892 * stragglers again, which we can imagine as an extension of the
895 index
= suc
->current
- suc
->list
.nr
;
896 if (index
< suc
->failed_clones_nr
) {
898 ce
= suc
->failed_clones
[index
];
899 if (!prepare_to_clone_next_submodule(ce
, child
, suc
, err
)) {
901 strbuf_addstr(err
, "BUG: submodule considered for "
902 "cloning, doesn't need cloning "
906 p
= xmalloc(sizeof(*p
));
916 static int update_clone_start_failure(struct strbuf
*err
,
920 struct submodule_update_clone
*suc
= suc_cb
;
925 static int update_clone_task_finished(int result
,
930 const struct cache_entry
*ce
;
931 struct submodule_update_clone
*suc
= suc_cb
;
933 int *idxP
= idx_task_cb
;
940 if (idx
< suc
->list
.nr
) {
941 ce
= suc
->list
.entries
[idx
];
942 strbuf_addf(err
, _("Failed to clone '%s'. Retry scheduled"),
944 strbuf_addch(err
, '\n');
945 ALLOC_GROW(suc
->failed_clones
,
946 suc
->failed_clones_nr
+ 1,
947 suc
->failed_clones_alloc
);
948 suc
->failed_clones
[suc
->failed_clones_nr
++] = ce
;
952 ce
= suc
->failed_clones
[idx
];
953 strbuf_addf(err
, _("Failed to clone '%s' a second time, aborting"),
955 strbuf_addch(err
, '\n');
963 static int update_clone(int argc
, const char **argv
, const char *prefix
)
965 const char *update
= NULL
;
967 struct string_list_item
*item
;
968 struct pathspec pathspec
;
969 struct submodule_update_clone suc
= SUBMODULE_UPDATE_CLONE_INIT
;
971 struct option module_update_clone_options
[] = {
972 OPT_STRING(0, "prefix", &prefix
,
974 N_("path into the working tree")),
975 OPT_STRING(0, "recursive-prefix", &suc
.recursive_prefix
,
977 N_("path into the working tree, across nested "
978 "submodule boundaries")),
979 OPT_STRING(0, "update", &update
,
981 N_("rebase, merge, checkout or none")),
982 OPT_STRING_LIST(0, "reference", &suc
.references
, N_("repo"),
983 N_("reference repository")),
984 OPT_STRING(0, "depth", &suc
.depth
, "<depth>",
985 N_("Create a shallow clone truncated to the "
986 "specified number of revisions")),
987 OPT_INTEGER('j', "jobs", &max_jobs
,
988 N_("parallel jobs")),
989 OPT_BOOL(0, "recommend-shallow", &suc
.recommend_shallow
,
990 N_("whether the initial clone should follow the shallow recommendation")),
991 OPT__QUIET(&suc
.quiet
, N_("don't print cloning progress")),
992 OPT_BOOL(0, "progress", &suc
.progress
,
993 N_("force cloning progress")),
997 const char *const git_submodule_helper_usage
[] = {
998 N_("git submodule--helper update_clone [--prefix=<path>] [<path>...]"),
1001 suc
.prefix
= prefix
;
1003 argc
= parse_options(argc
, argv
, prefix
, module_update_clone_options
,
1004 git_submodule_helper_usage
, 0);
1007 if (parse_submodule_update_strategy(update
, &suc
.update
) < 0)
1008 die(_("bad value for update parameter"));
1010 if (module_list_compute(argc
, argv
, prefix
, &pathspec
, &suc
.list
) < 0)
1014 suc
.warn_if_uninitialized
= 1;
1016 /* Overlay the parsed .gitmodules file with .git/config */
1017 gitmodules_config();
1018 git_config(submodule_config
, NULL
);
1021 max_jobs
= parallel_submodules();
1023 run_processes_parallel(max_jobs
,
1024 update_clone_get_next_task
,
1025 update_clone_start_failure
,
1026 update_clone_task_finished
,
1030 * We saved the output and put it out all at once now.
1032 * - the listener does not have to interleave their (checkout)
1033 * work with our fetching. The writes involved in a
1034 * checkout involve more straightforward sequential I/O.
1035 * - the listener can avoid doing any work if fetching failed.
1040 for_each_string_list_item(item
, &suc
.projectlines
)
1041 fprintf(stdout
, "%s", item
->string
);
1046 static int resolve_relative_path(int argc
, const char **argv
, const char *prefix
)
1048 struct strbuf sb
= STRBUF_INIT
;
1050 die("submodule--helper relative-path takes exactly 2 arguments, got %d", argc
);
1052 printf("%s", relative_path(argv
[1], argv
[2], &sb
));
1053 strbuf_release(&sb
);
1057 static const char *remote_submodule_branch(const char *path
)
1059 const struct submodule
*sub
;
1060 gitmodules_config();
1061 git_config(submodule_config
, NULL
);
1063 sub
= submodule_from_path(null_sha1
, path
);
1070 if (!strcmp(sub
->branch
, ".")) {
1071 unsigned char sha1
[20];
1072 const char *refname
= resolve_ref_unsafe("HEAD", 0, sha1
, NULL
);
1075 die(_("No such ref: %s"), "HEAD");
1078 if (!strcmp(refname
, "HEAD"))
1079 die(_("Submodule (%s) branch configured to inherit "
1080 "branch from superproject, but the superproject "
1081 "is not on any branch"), sub
->name
);
1083 if (!skip_prefix(refname
, "refs/heads/", &refname
))
1084 die(_("Expecting a full ref name, got %s"), refname
);
1091 static int resolve_remote_submodule_branch(int argc
, const char **argv
,
1095 struct strbuf sb
= STRBUF_INIT
;
1097 die("submodule--helper remote-branch takes exactly one arguments, got %d", argc
);
1099 ret
= remote_submodule_branch(argv
[1]);
1101 die("submodule %s doesn't exist", argv
[1]);
1104 strbuf_release(&sb
);
1108 static int push_check(int argc
, const char **argv
, const char *prefix
)
1110 struct remote
*remote
;
1111 const char *superproject_head
;
1113 int detached_head
= 0;
1114 struct object_id head_oid
;
1117 die("submodule--helper push-check requires at least 2 arguments");
1120 * superproject's resolved head ref.
1121 * if HEAD then the superproject is in a detached head state, otherwise
1122 * it will be the resolved head ref.
1124 superproject_head
= argv
[1];
1127 /* Get the submodule's head ref and determine if it is detached */
1128 head
= resolve_refdup("HEAD", 0, head_oid
.hash
, NULL
);
1130 die(_("Failed to resolve HEAD as a valid ref."));
1131 if (!strcmp(head
, "HEAD"))
1135 * The remote must be configured.
1136 * This is to avoid pushing to the exact same URL as the parent.
1138 remote
= pushremote_get(argv
[1]);
1139 if (!remote
|| remote
->origin
== REMOTE_UNCONFIGURED
)
1140 die("remote '%s' not configured", argv
[1]);
1142 /* Check the refspec */
1144 int i
, refspec_nr
= argc
- 2;
1145 struct ref
*local_refs
= get_local_heads();
1146 struct refspec
*refspec
= parse_push_refspec(refspec_nr
,
1149 for (i
= 0; i
< refspec_nr
; i
++) {
1150 struct refspec
*rs
= refspec
+ i
;
1152 if (rs
->pattern
|| rs
->matching
)
1155 /* LHS must match a single ref */
1156 switch (count_refspec_match(rs
->src
, local_refs
, NULL
)) {
1161 * If LHS matches 'HEAD' then we need to ensure
1162 * that it matches the same named branch
1163 * checked out in the superproject.
1165 if (!strcmp(rs
->src
, "HEAD")) {
1166 if (!detached_head
&&
1167 !strcmp(head
, superproject_head
))
1169 die("HEAD does not match the named branch in the superproject");
1172 die("src refspec '%s' must name a ref",
1176 free_refspec(refspec_nr
, refspec
);
1183 static int absorb_git_dirs(int argc
, const char **argv
, const char *prefix
)
1186 struct pathspec pathspec
;
1187 struct module_list list
= MODULE_LIST_INIT
;
1188 unsigned flags
= ABSORB_GITDIR_RECURSE_SUBMODULES
;
1190 struct option embed_gitdir_options
[] = {
1191 OPT_STRING(0, "prefix", &prefix
,
1193 N_("path into the working tree")),
1194 OPT_BIT(0, "--recursive", &flags
, N_("recurse into submodules"),
1195 ABSORB_GITDIR_RECURSE_SUBMODULES
),
1199 const char *const git_submodule_helper_usage
[] = {
1200 N_("git submodule--helper embed-git-dir [<path>...]"),
1204 argc
= parse_options(argc
, argv
, prefix
, embed_gitdir_options
,
1205 git_submodule_helper_usage
, 0);
1207 gitmodules_config();
1208 git_config(submodule_config
, NULL
);
1210 if (module_list_compute(argc
, argv
, prefix
, &pathspec
, &list
) < 0)
1213 for (i
= 0; i
< list
.nr
; i
++)
1214 absorb_git_dir_into_superproject(prefix
,
1215 list
.entries
[i
]->name
, flags
);
1220 static int is_active(int argc
, const char **argv
, const char *prefix
)
1223 die("submodule--helper is-active takes exactly 1 argument");
1225 gitmodules_config();
1227 return !is_submodule_active(the_repository
, argv
[1]);
1230 #define SUPPORT_SUPER_PREFIX (1<<0)
1234 int (*fn
)(int, const char **, const char *);
1238 static struct cmd_struct commands
[] = {
1239 {"list", module_list
, 0},
1240 {"name", module_name
, 0},
1241 {"clone", module_clone
, 0},
1242 {"update-clone", update_clone
, 0},
1243 {"relative-path", resolve_relative_path
, 0},
1244 {"resolve-relative-url", resolve_relative_url
, 0},
1245 {"resolve-relative-url-test", resolve_relative_url_test
, 0},
1246 {"init", module_init
, SUPPORT_SUPER_PREFIX
},
1247 {"remote-branch", resolve_remote_submodule_branch
, 0},
1248 {"push-check", push_check
, 0},
1249 {"absorb-git-dirs", absorb_git_dirs
, SUPPORT_SUPER_PREFIX
},
1250 {"is-active", is_active
, 0},
1253 int cmd_submodule__helper(int argc
, const char **argv
, const char *prefix
)
1256 if (argc
< 2 || !strcmp(argv
[1], "-h"))
1257 usage("git submodule--helper <command>");
1259 for (i
= 0; i
< ARRAY_SIZE(commands
); i
++) {
1260 if (!strcmp(argv
[1], commands
[i
].cmd
)) {
1261 if (get_super_prefix() &&
1262 !(commands
[i
].option
& SUPPORT_SUPER_PREFIX
))
1263 die(_("%s doesn't support --super-prefix"),
1265 return commands
[i
].fn(argc
- 1, argv
+ 1, prefix
);
1269 die(_("'%s' is not a valid submodule--helper "
1270 "subcommand"), argv
[1]);