1 #define USE_THE_INDEX_COMPATIBILITY_MACROS
3 #include "repository.h"
6 #include "parse-options.h"
10 #include "submodule.h"
11 #include "submodule-config.h"
12 #include "string-list.h"
13 #include "run-command.h"
21 #include "object-store.h"
24 #define OPT_QUIET (1 << 0)
25 #define OPT_CACHED (1 << 1)
26 #define OPT_RECURSIVE (1 << 2)
27 #define OPT_FORCE (1 << 3)
29 typedef void (*each_submodule_fn)(const struct cache_entry *list_item,
32 static char *get_default_remote(void)
34 char *dest = NULL, *ret;
35 struct strbuf sb = STRBUF_INIT;
36 const char *refname = resolve_ref_unsafe("HEAD", 0, NULL, NULL);
39 die(_("No such ref: %s"), "HEAD");
42 if (!strcmp(refname, "HEAD"))
43 return xstrdup("origin");
45 if (!skip_prefix(refname, "refs/heads/", &refname))
46 die(_("Expecting a full ref name, got %s"), refname);
48 strbuf_addf(&sb, "branch.%s.remote", refname);
49 if (git_config_get_string(sb.buf, &dest))
50 ret = xstrdup("origin");
58 static int print_default_remote(int argc, const char **argv, const char *prefix)
63 die(_("submodule--helper print-default-remote takes no arguments"));
65 remote = get_default_remote();
67 printf("%s\n", remote);
73 static int starts_with_dot_slash(const char *str)
75 return str[0] == '.' && is_dir_sep(str[1]);
78 static int starts_with_dot_dot_slash(const char *str)
80 return str[0] == '.' && str[1] == '.' && is_dir_sep(str[2]);
84 * Returns 1 if it was the last chop before ':'.
86 static int chop_last_dir(char **remoteurl, int is_relative)
88 char *rfind = find_last_dir_sep(*remoteurl);
94 rfind = strrchr(*remoteurl, ':');
100 if (is_relative || !strcmp(".", *remoteurl))
101 die(_("cannot strip one component off url '%s'"),
105 *remoteurl = xstrdup(".");
110 * The `url` argument is the URL that navigates to the submodule origin
111 * repo. When relative, this URL is relative to the superproject origin
112 * URL repo. The `up_path` argument, if specified, is the relative
113 * path that navigates from the submodule working tree to the superproject
114 * working tree. Returns the origin URL of the submodule.
116 * Return either an absolute URL or filesystem path (if the superproject
117 * origin URL is an absolute URL or filesystem path, respectively) or a
118 * relative file system path (if the superproject origin URL is a relative
121 * When the output is a relative file system path, the path is either
122 * relative to the submodule working tree, if up_path is specified, or to
123 * the superproject working tree otherwise.
125 * NEEDSWORK: This works incorrectly on the domain and protocol part.
126 * remote_url url outcome expectation
127 * http://a.com/b ../c http://a.com/c as is
128 * http://a.com/b/ ../c http://a.com/c same as previous line, but
129 * ignore trailing slash in url
130 * http://a.com/b ../../c http://c error out
131 * http://a.com/b ../../../c http:/c error out
132 * http://a.com/b ../../../../c http:c error out
133 * http://a.com/b ../../../../../c .:c error out
134 * NEEDSWORK: Given how chop_last_dir() works, this function is broken
135 * when a local part has a colon in its path component, too.
137 static char *relative_url(const char *remote_url,
144 char *remoteurl = xstrdup(remote_url);
145 struct strbuf sb = STRBUF_INIT;
146 size_t len = strlen(remoteurl);
148 if (is_dir_sep(remoteurl[len-1]))
149 remoteurl[len-1] = '\0';
151 if (!url_is_local_not_ssh(remoteurl) || is_absolute_path(remoteurl))
156 * Prepend a './' to ensure all relative
157 * remoteurls start with './' or '../'
159 if (!starts_with_dot_slash(remoteurl) &&
160 !starts_with_dot_dot_slash(remoteurl)) {
162 strbuf_addf(&sb, "./%s", remoteurl);
164 remoteurl = strbuf_detach(&sb, NULL);
168 * When the url starts with '../', remove that and the
169 * last directory in remoteurl.
172 if (starts_with_dot_dot_slash(url)) {
174 colonsep |= chop_last_dir(&remoteurl, is_relative);
175 } else if (starts_with_dot_slash(url))
181 strbuf_addf(&sb, "%s%s%s", remoteurl, colonsep ? ":" : "/", url);
182 if (ends_with(url, "/"))
183 strbuf_setlen(&sb, sb.len - 1);
186 if (starts_with_dot_slash(sb.buf))
187 out = xstrdup(sb.buf + 2);
189 out = xstrdup(sb.buf);
192 if (!up_path || !is_relative)
195 strbuf_addf(&sb, "%s%s", up_path, out);
197 return strbuf_detach(&sb, NULL);
200 static int resolve_relative_url(int argc, const char **argv, const char *prefix)
202 char *remoteurl = NULL;
203 char *remote = get_default_remote();
204 const char *up_path = NULL;
207 struct strbuf sb = STRBUF_INIT;
209 if (argc != 2 && argc != 3)
210 die("resolve-relative-url only accepts one or two arguments");
213 strbuf_addf(&sb, "remote.%s.url", remote);
216 if (git_config_get_string(sb.buf, &remoteurl))
217 /* the repository is its own authoritative upstream */
218 remoteurl = xgetcwd();
223 res = relative_url(remoteurl, url, up_path);
230 static int resolve_relative_url_test(int argc, const char **argv, const char *prefix)
232 char *remoteurl, *res;
233 const char *up_path, *url;
236 die("resolve-relative-url-test only accepts three arguments: <up_path> <remoteurl> <url>");
239 remoteurl = xstrdup(argv[2]);
242 if (!strcmp(up_path, "(null)"))
245 res = relative_url(remoteurl, url, up_path);
252 /* the result should be freed by the caller. */
253 static char *get_submodule_displaypath(const char *path, const char *prefix)
255 const char *super_prefix = get_super_prefix();
257 if (prefix && super_prefix) {
258 BUG("cannot have prefix '%s' and superprefix '%s'",
259 prefix, super_prefix);
261 struct strbuf sb = STRBUF_INIT;
262 char *displaypath = xstrdup(relative_path(path, prefix, &sb));
265 } else if (super_prefix) {
266 return xstrfmt("%s%s", super_prefix, path);
268 return xstrdup(path);
272 static char *compute_rev_name(const char *sub_path, const char* object_id)
274 struct strbuf sb = STRBUF_INIT;
277 static const char *describe_bare[] = { NULL };
279 static const char *describe_tags[] = { "--tags", NULL };
281 static const char *describe_contains[] = { "--contains", NULL };
283 static const char *describe_all_always[] = { "--all", "--always", NULL };
285 static const char **describe_argv[] = { describe_bare, describe_tags,
287 describe_all_always, NULL };
289 for (d = describe_argv; *d; d++) {
290 struct child_process cp = CHILD_PROCESS_INIT;
291 prepare_submodule_repo_env(&cp.env_array);
296 argv_array_push(&cp.args, "describe");
297 argv_array_pushv(&cp.args, *d);
298 argv_array_push(&cp.args, object_id);
300 if (!capture_command(&cp, &sb, 0)) {
301 strbuf_strip_suffix(&sb, "\n");
302 return strbuf_detach(&sb, NULL);
311 const struct cache_entry **entries;
314 #define MODULE_LIST_INIT { NULL, 0, 0 }
316 static int module_list_compute(int argc, const char **argv,
318 struct pathspec *pathspec,
319 struct module_list *list)
322 char *ps_matched = NULL;
323 parse_pathspec(pathspec, 0,
324 PATHSPEC_PREFER_FULL,
328 ps_matched = xcalloc(pathspec->nr, 1);
330 if (read_cache() < 0)
331 die(_("index file corrupt"));
333 for (i = 0; i < active_nr; i++) {
334 const struct cache_entry *ce = active_cache[i];
336 if (!match_pathspec(&the_index, pathspec, ce->name, ce_namelen(ce),
338 !S_ISGITLINK(ce->ce_mode))
341 ALLOC_GROW(list->entries, list->nr + 1, list->alloc);
342 list->entries[list->nr++] = ce;
343 while (i + 1 < active_nr &&
344 !strcmp(ce->name, active_cache[i + 1]->name))
346 * Skip entries with the same name in different stages
347 * to make sure an entry is returned only once.
352 if (ps_matched && report_path_error(ps_matched, pathspec))
360 static void module_list_active(struct module_list *list)
363 struct module_list active_modules = MODULE_LIST_INIT;
365 for (i = 0; i < list->nr; i++) {
366 const struct cache_entry *ce = list->entries[i];
368 if (!is_submodule_active(the_repository, ce->name))
371 ALLOC_GROW(active_modules.entries,
372 active_modules.nr + 1,
373 active_modules.alloc);
374 active_modules.entries[active_modules.nr++] = ce;
378 *list = active_modules;
381 static char *get_up_path(const char *path)
384 struct strbuf sb = STRBUF_INIT;
386 for (i = count_slashes(path); i; i--)
387 strbuf_addstr(&sb, "../");
390 * Check if 'path' ends with slash or not
391 * for having the same output for dir/sub_dir
394 if (!is_dir_sep(path[strlen(path) - 1]))
395 strbuf_addstr(&sb, "../");
397 return strbuf_detach(&sb, NULL);
400 static int module_list(int argc, const char **argv, const char *prefix)
403 struct pathspec pathspec;
404 struct module_list list = MODULE_LIST_INIT;
406 struct option module_list_options[] = {
407 OPT_STRING(0, "prefix", &prefix,
409 N_("alternative anchor for relative paths")),
413 const char *const git_submodule_helper_usage[] = {
414 N_("git submodule--helper list [--prefix=<path>] [<path>...]"),
418 argc = parse_options(argc, argv, prefix, module_list_options,
419 git_submodule_helper_usage, 0);
421 if (module_list_compute(argc, argv, prefix, &pathspec, &list) < 0)
424 for (i = 0; i < list.nr; i++) {
425 const struct cache_entry *ce = list.entries[i];
428 printf("%06o %s U\t", ce->ce_mode, sha1_to_hex(null_sha1));
430 printf("%06o %s %d\t", ce->ce_mode,
431 oid_to_hex(&ce->oid), ce_stage(ce));
433 fprintf(stdout, "%s\n", ce->name);
438 static void for_each_listed_submodule(const struct module_list *list,
439 each_submodule_fn fn, void *cb_data)
442 for (i = 0; i < list->nr; i++)
443 fn(list->entries[i], cb_data);
453 #define CB_FOREACH_INIT { 0 }
455 static void runcommand_in_submodule_cb(const struct cache_entry *list_item,
458 struct cb_foreach *info = cb_data;
459 const char *path = list_item->name;
460 const struct object_id *ce_oid = &list_item->oid;
462 const struct submodule *sub;
463 struct child_process cp = CHILD_PROCESS_INIT;
466 displaypath = get_submodule_displaypath(path, info->prefix);
468 sub = submodule_from_path(the_repository, &null_oid, path);
471 die(_("No url found for submodule path '%s' in .gitmodules"),
474 if (!is_submodule_populated_gently(path, NULL))
477 prepare_submodule_repo_env(&cp.env_array);
480 * For the purpose of executing <command> in the submodule,
481 * separate shell is used for the purpose of running the
488 * NEEDSWORK: the command currently has access to the variables $name,
489 * $sm_path, $displaypath, $sha1 and $toplevel only when the command
490 * contains a single argument. This is done for maintaining a faithful
491 * translation from shell script.
493 if (info->argc == 1) {
494 char *toplevel = xgetcwd();
495 struct strbuf sb = STRBUF_INIT;
497 argv_array_pushf(&cp.env_array, "name=%s", sub->name);
498 argv_array_pushf(&cp.env_array, "sm_path=%s", path);
499 argv_array_pushf(&cp.env_array, "displaypath=%s", displaypath);
500 argv_array_pushf(&cp.env_array, "sha1=%s",
502 argv_array_pushf(&cp.env_array, "toplevel=%s", toplevel);
505 * Since the path variable was accessible from the script
506 * before porting, it is also made available after porting.
507 * The environment variable "PATH" has a very special purpose
508 * on windows. And since environment variables are
509 * case-insensitive in windows, it interferes with the
510 * existing PATH variable. Hence, to avoid that, we expose
511 * path via the args argv_array and not via env_array.
513 sq_quote_buf(&sb, path);
514 argv_array_pushf(&cp.args, "path=%s; %s",
515 sb.buf, info->argv[0]);
519 argv_array_pushv(&cp.args, info->argv);
523 printf(_("Entering '%s'\n"), displaypath);
525 if (info->argv[0] && run_command(&cp))
526 die(_("run_command returned non-zero status for %s\n."),
529 if (info->recursive) {
530 struct child_process cpr = CHILD_PROCESS_INIT;
534 prepare_submodule_repo_env(&cpr.env_array);
536 argv_array_pushl(&cpr.args, "--super-prefix", NULL);
537 argv_array_pushf(&cpr.args, "%s/", displaypath);
538 argv_array_pushl(&cpr.args, "submodule--helper", "foreach", "--recursive",
542 argv_array_push(&cpr.args, "--quiet");
544 argv_array_push(&cpr.args, "--");
545 argv_array_pushv(&cpr.args, info->argv);
547 if (run_command(&cpr))
548 die(_("run_command returned non-zero status while "
549 "recursing in the nested submodules of %s\n."),
557 static int module_foreach(int argc, const char **argv, const char *prefix)
559 struct cb_foreach info = CB_FOREACH_INIT;
560 struct pathspec pathspec;
561 struct module_list list = MODULE_LIST_INIT;
563 struct option module_foreach_options[] = {
564 OPT__QUIET(&info.quiet, N_("Suppress output of entering each submodule command")),
565 OPT_BOOL(0, "recursive", &info.recursive,
566 N_("Recurse into nested submodules")),
570 const char *const git_submodule_helper_usage[] = {
571 N_("git submodule--helper foreach [--quiet] [--recursive] [--] <command>"),
575 argc = parse_options(argc, argv, prefix, module_foreach_options,
576 git_submodule_helper_usage, 0);
578 if (module_list_compute(0, NULL, prefix, &pathspec, &list) < 0)
583 info.prefix = prefix;
585 for_each_listed_submodule(&list, runcommand_in_submodule_cb, &info);
590 static char *compute_submodule_clone_url(const char *rel_url)
592 char *remoteurl, *relurl;
593 char *remote = get_default_remote();
594 struct strbuf remotesb = STRBUF_INIT;
596 strbuf_addf(&remotesb, "remote.%s.url", remote);
597 if (git_config_get_string(remotesb.buf, &remoteurl)) {
598 warning(_("could not look up configuration '%s'. Assuming this repository is its own authoritative upstream."), remotesb.buf);
599 remoteurl = xgetcwd();
601 relurl = relative_url(remoteurl, rel_url, NULL);
605 strbuf_release(&remotesb);
615 #define INIT_CB_INIT { NULL, 0 }
617 static void init_submodule(const char *path, const char *prefix,
620 const struct submodule *sub;
621 struct strbuf sb = STRBUF_INIT;
622 char *upd = NULL, *url = NULL, *displaypath;
624 displaypath = get_submodule_displaypath(path, prefix);
626 sub = submodule_from_path(the_repository, &null_oid, path);
629 die(_("No url found for submodule path '%s' in .gitmodules"),
633 * NEEDSWORK: In a multi-working-tree world, this needs to be
634 * set in the per-worktree config.
636 * Set active flag for the submodule being initialized
638 if (!is_submodule_active(the_repository, path)) {
639 strbuf_addf(&sb, "submodule.%s.active", sub->name);
640 git_config_set_gently(sb.buf, "true");
645 * Copy url setting when it is not set yet.
646 * To look up the url in .git/config, we must not fall back to
647 * .gitmodules, so look it up directly.
649 strbuf_addf(&sb, "submodule.%s.url", sub->name);
650 if (git_config_get_string(sb.buf, &url)) {
652 die(_("No url found for submodule path '%s' in .gitmodules"),
655 url = xstrdup(sub->url);
657 /* Possibly a url relative to parent */
658 if (starts_with_dot_dot_slash(url) ||
659 starts_with_dot_slash(url)) {
661 url = compute_submodule_clone_url(oldurl);
665 if (git_config_set_gently(sb.buf, url))
666 die(_("Failed to register url for submodule path '%s'"),
668 if (!(flags & OPT_QUIET))
670 _("Submodule '%s' (%s) registered for path '%s'\n"),
671 sub->name, url, displaypath);
675 /* Copy "update" setting when it is not set yet */
676 strbuf_addf(&sb, "submodule.%s.update", sub->name);
677 if (git_config_get_string(sb.buf, &upd) &&
678 sub->update_strategy.type != SM_UPDATE_UNSPECIFIED) {
679 if (sub->update_strategy.type == SM_UPDATE_COMMAND) {
680 fprintf(stderr, _("warning: command update mode suggested for submodule '%s'\n"),
682 upd = xstrdup("none");
684 upd = xstrdup(submodule_strategy_to_string(&sub->update_strategy));
686 if (git_config_set_gently(sb.buf, upd))
687 die(_("Failed to register update mode for submodule path '%s'"), displaypath);
695 static void init_submodule_cb(const struct cache_entry *list_item, void *cb_data)
697 struct init_cb *info = cb_data;
698 init_submodule(list_item->name, info->prefix, info->flags);
701 static int module_init(int argc, const char **argv, const char *prefix)
703 struct init_cb info = INIT_CB_INIT;
704 struct pathspec pathspec;
705 struct module_list list = MODULE_LIST_INIT;
708 struct option module_init_options[] = {
709 OPT__QUIET(&quiet, N_("Suppress output for initializing a submodule")),
713 const char *const git_submodule_helper_usage[] = {
714 N_("git submodule--helper init [<options>] [<path>]"),
718 argc = parse_options(argc, argv, prefix, module_init_options,
719 git_submodule_helper_usage, 0);
721 if (module_list_compute(argc, argv, prefix, &pathspec, &list) < 0)
725 * If there are no path args and submodule.active is set then,
726 * by default, only initialize 'active' modules.
728 if (!argc && git_config_get_value_multi("submodule.active"))
729 module_list_active(&list);
731 info.prefix = prefix;
733 info.flags |= OPT_QUIET;
735 for_each_listed_submodule(&list, init_submodule_cb, &info);
745 #define STATUS_CB_INIT { NULL, 0 }
747 static void print_status(unsigned int flags, char state, const char *path,
748 const struct object_id *oid, const char *displaypath)
750 if (flags & OPT_QUIET)
753 printf("%c%s %s", state, oid_to_hex(oid), displaypath);
755 if (state == ' ' || state == '+') {
756 const char *name = compute_rev_name(path, oid_to_hex(oid));
759 printf(" (%s)", name);
765 static int handle_submodule_head_ref(const char *refname,
766 const struct object_id *oid, int flags,
769 struct object_id *output = cb_data;
776 static void status_submodule(const char *path, const struct object_id *ce_oid,
777 unsigned int ce_flags, const char *prefix,
781 struct argv_array diff_files_args = ARGV_ARRAY_INIT;
783 int diff_files_result;
784 struct strbuf buf = STRBUF_INIT;
787 if (!submodule_from_path(the_repository, &null_oid, path))
788 die(_("no submodule mapping found in .gitmodules for path '%s'"),
791 displaypath = get_submodule_displaypath(path, prefix);
793 if ((CE_STAGEMASK & ce_flags) >> CE_STAGESHIFT) {
794 print_status(flags, 'U', path, &null_oid, displaypath);
798 strbuf_addf(&buf, "%s/.git", path);
799 git_dir = read_gitfile(buf.buf);
803 if (!is_submodule_active(the_repository, path) ||
804 !is_git_directory(git_dir)) {
805 print_status(flags, '-', path, ce_oid, displaypath);
806 strbuf_release(&buf);
809 strbuf_release(&buf);
811 argv_array_pushl(&diff_files_args, "diff-files",
812 "--ignore-submodules=dirty", "--quiet", "--",
815 git_config(git_diff_basic_config, NULL);
816 repo_init_revisions(the_repository, &rev, prefix);
818 diff_files_args.argc = setup_revisions(diff_files_args.argc,
819 diff_files_args.argv,
821 diff_files_result = run_diff_files(&rev, 0);
823 if (!diff_result_code(&rev.diffopt, diff_files_result)) {
824 print_status(flags, ' ', path, ce_oid,
826 } else if (!(flags & OPT_CACHED)) {
827 struct object_id oid;
828 struct ref_store *refs = get_submodule_ref_store(path);
831 print_status(flags, '-', path, ce_oid, displaypath);
834 if (refs_head_ref(refs, handle_submodule_head_ref, &oid))
835 die(_("could not resolve HEAD ref inside the "
836 "submodule '%s'"), path);
838 print_status(flags, '+', path, &oid, displaypath);
840 print_status(flags, '+', path, ce_oid, displaypath);
843 if (flags & OPT_RECURSIVE) {
844 struct child_process cpr = CHILD_PROCESS_INIT;
848 prepare_submodule_repo_env(&cpr.env_array);
850 argv_array_push(&cpr.args, "--super-prefix");
851 argv_array_pushf(&cpr.args, "%s/", displaypath);
852 argv_array_pushl(&cpr.args, "submodule--helper", "status",
853 "--recursive", NULL);
855 if (flags & OPT_CACHED)
856 argv_array_push(&cpr.args, "--cached");
858 if (flags & OPT_QUIET)
859 argv_array_push(&cpr.args, "--quiet");
861 if (run_command(&cpr))
862 die(_("failed to recurse into submodule '%s'"), path);
866 argv_array_clear(&diff_files_args);
870 static void status_submodule_cb(const struct cache_entry *list_item,
873 struct status_cb *info = cb_data;
874 status_submodule(list_item->name, &list_item->oid, list_item->ce_flags,
875 info->prefix, info->flags);
878 static int module_status(int argc, const char **argv, const char *prefix)
880 struct status_cb info = STATUS_CB_INIT;
881 struct pathspec pathspec;
882 struct module_list list = MODULE_LIST_INIT;
885 struct option module_status_options[] = {
886 OPT__QUIET(&quiet, N_("Suppress submodule status output")),
887 OPT_BIT(0, "cached", &info.flags, N_("Use commit stored in the index instead of the one stored in the submodule HEAD"), OPT_CACHED),
888 OPT_BIT(0, "recursive", &info.flags, N_("recurse into nested submodules"), OPT_RECURSIVE),
892 const char *const git_submodule_helper_usage[] = {
893 N_("git submodule status [--quiet] [--cached] [--recursive] [<path>...]"),
897 argc = parse_options(argc, argv, prefix, module_status_options,
898 git_submodule_helper_usage, 0);
900 if (module_list_compute(argc, argv, prefix, &pathspec, &list) < 0)
903 info.prefix = prefix;
905 info.flags |= OPT_QUIET;
907 for_each_listed_submodule(&list, status_submodule_cb, &info);
912 static int module_name(int argc, const char **argv, const char *prefix)
914 const struct submodule *sub;
917 usage(_("git submodule--helper name <path>"));
919 sub = submodule_from_path(the_repository, &null_oid, argv[1]);
922 die(_("no submodule mapping found in .gitmodules for path '%s'"),
925 printf("%s\n", sub->name);
935 #define SYNC_CB_INIT { NULL, 0 }
937 static void sync_submodule(const char *path, const char *prefix,
940 const struct submodule *sub;
941 char *remote_key = NULL;
942 char *sub_origin_url, *super_config_url, *displaypath;
943 struct strbuf sb = STRBUF_INIT;
944 struct child_process cp = CHILD_PROCESS_INIT;
945 char *sub_config_path = NULL;
947 if (!is_submodule_active(the_repository, path))
950 sub = submodule_from_path(the_repository, &null_oid, path);
952 if (sub && sub->url) {
953 if (starts_with_dot_dot_slash(sub->url) ||
954 starts_with_dot_slash(sub->url)) {
955 char *remote_url, *up_path;
956 char *remote = get_default_remote();
957 strbuf_addf(&sb, "remote.%s.url", remote);
959 if (git_config_get_string(sb.buf, &remote_url))
960 remote_url = xgetcwd();
962 up_path = get_up_path(path);
963 sub_origin_url = relative_url(remote_url, sub->url, up_path);
964 super_config_url = relative_url(remote_url, sub->url, NULL);
970 sub_origin_url = xstrdup(sub->url);
971 super_config_url = xstrdup(sub->url);
974 sub_origin_url = xstrdup("");
975 super_config_url = xstrdup("");
978 displaypath = get_submodule_displaypath(path, prefix);
980 if (!(flags & OPT_QUIET))
981 printf(_("Synchronizing submodule url for '%s'\n"),
985 strbuf_addf(&sb, "submodule.%s.url", sub->name);
986 if (git_config_set_gently(sb.buf, super_config_url))
987 die(_("failed to register url for submodule path '%s'"),
990 if (!is_submodule_populated_gently(path, NULL))
993 prepare_submodule_repo_env(&cp.env_array);
996 argv_array_pushl(&cp.args, "submodule--helper",
997 "print-default-remote", NULL);
1000 if (capture_command(&cp, &sb, 0))
1001 die(_("failed to get the default remote for submodule '%s'"),
1004 strbuf_strip_suffix(&sb, "\n");
1005 remote_key = xstrfmt("remote.%s.url", sb.buf);
1008 submodule_to_gitdir(&sb, path);
1009 strbuf_addstr(&sb, "/config");
1011 if (git_config_set_in_file_gently(sb.buf, remote_key, sub_origin_url))
1012 die(_("failed to update remote for submodule '%s'"),
1015 if (flags & OPT_RECURSIVE) {
1016 struct child_process cpr = CHILD_PROCESS_INIT;
1020 prepare_submodule_repo_env(&cpr.env_array);
1022 argv_array_push(&cpr.args, "--super-prefix");
1023 argv_array_pushf(&cpr.args, "%s/", displaypath);
1024 argv_array_pushl(&cpr.args, "submodule--helper", "sync",
1025 "--recursive", NULL);
1027 if (flags & OPT_QUIET)
1028 argv_array_push(&cpr.args, "--quiet");
1030 if (run_command(&cpr))
1031 die(_("failed to recurse into submodule '%s'"),
1036 free(super_config_url);
1037 free(sub_origin_url);
1038 strbuf_release(&sb);
1041 free(sub_config_path);
1044 static void sync_submodule_cb(const struct cache_entry *list_item, void *cb_data)
1046 struct sync_cb *info = cb_data;
1047 sync_submodule(list_item->name, info->prefix, info->flags);
1050 static int module_sync(int argc, const char **argv, const char *prefix)
1052 struct sync_cb info = SYNC_CB_INIT;
1053 struct pathspec pathspec;
1054 struct module_list list = MODULE_LIST_INIT;
1058 struct option module_sync_options[] = {
1059 OPT__QUIET(&quiet, N_("Suppress output of synchronizing submodule url")),
1060 OPT_BOOL(0, "recursive", &recursive,
1061 N_("Recurse into nested submodules")),
1065 const char *const git_submodule_helper_usage[] = {
1066 N_("git submodule--helper sync [--quiet] [--recursive] [<path>]"),
1070 argc = parse_options(argc, argv, prefix, module_sync_options,
1071 git_submodule_helper_usage, 0);
1073 if (module_list_compute(argc, argv, prefix, &pathspec, &list) < 0)
1076 info.prefix = prefix;
1078 info.flags |= OPT_QUIET;
1080 info.flags |= OPT_RECURSIVE;
1082 for_each_listed_submodule(&list, sync_submodule_cb, &info);
1091 #define DEINIT_CB_INIT { NULL, 0 }
1093 static void deinit_submodule(const char *path, const char *prefix,
1096 const struct submodule *sub;
1097 char *displaypath = NULL;
1098 struct child_process cp_config = CHILD_PROCESS_INIT;
1099 struct strbuf sb_config = STRBUF_INIT;
1100 char *sub_git_dir = xstrfmt("%s/.git", path);
1102 sub = submodule_from_path(the_repository, &null_oid, path);
1104 if (!sub || !sub->name)
1107 displaypath = get_submodule_displaypath(path, prefix);
1109 /* remove the submodule work tree (unless the user already did it) */
1110 if (is_directory(path)) {
1111 struct strbuf sb_rm = STRBUF_INIT;
1115 * protect submodules containing a .git directory
1116 * NEEDSWORK: instead of dying, automatically call
1117 * absorbgitdirs and (possibly) warn.
1119 if (is_directory(sub_git_dir))
1120 die(_("Submodule work tree '%s' contains a .git "
1121 "directory (use 'rm -rf' if you really want "
1122 "to remove it including all of its history)"),
1125 if (!(flags & OPT_FORCE)) {
1126 struct child_process cp_rm = CHILD_PROCESS_INIT;
1128 argv_array_pushl(&cp_rm.args, "rm", "-qn",
1131 if (run_command(&cp_rm))
1132 die(_("Submodule work tree '%s' contains local "
1133 "modifications; use '-f' to discard them"),
1137 strbuf_addstr(&sb_rm, path);
1139 if (!remove_dir_recursively(&sb_rm, 0))
1140 format = _("Cleared directory '%s'\n");
1142 format = _("Could not remove submodule work tree '%s'\n");
1144 if (!(flags & OPT_QUIET))
1145 printf(format, displaypath);
1147 submodule_unset_core_worktree(sub);
1149 strbuf_release(&sb_rm);
1152 if (mkdir(path, 0777))
1153 printf(_("could not create empty submodule directory %s"),
1156 cp_config.git_cmd = 1;
1157 argv_array_pushl(&cp_config.args, "config", "--get-regexp", NULL);
1158 argv_array_pushf(&cp_config.args, "submodule.%s\\.", sub->name);
1160 /* remove the .git/config entries (unless the user already did it) */
1161 if (!capture_command(&cp_config, &sb_config, 0) && sb_config.len) {
1162 char *sub_key = xstrfmt("submodule.%s", sub->name);
1164 * remove the whole section so we have a clean state when
1165 * the user later decides to init this submodule again
1167 git_config_rename_section_in_file(NULL, sub_key, NULL);
1168 if (!(flags & OPT_QUIET))
1169 printf(_("Submodule '%s' (%s) unregistered for path '%s'\n"),
1170 sub->name, sub->url, displaypath);
1177 strbuf_release(&sb_config);
1180 static void deinit_submodule_cb(const struct cache_entry *list_item,
1183 struct deinit_cb *info = cb_data;
1184 deinit_submodule(list_item->name, info->prefix, info->flags);
1187 static int module_deinit(int argc, const char **argv, const char *prefix)
1189 struct deinit_cb info = DEINIT_CB_INIT;
1190 struct pathspec pathspec;
1191 struct module_list list = MODULE_LIST_INIT;
1196 struct option module_deinit_options[] = {
1197 OPT__QUIET(&quiet, N_("Suppress submodule status output")),
1198 OPT__FORCE(&force, N_("Remove submodule working trees even if they contain local changes"), 0),
1199 OPT_BOOL(0, "all", &all, N_("Unregister all submodules")),
1203 const char *const git_submodule_helper_usage[] = {
1204 N_("git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"),
1208 argc = parse_options(argc, argv, prefix, module_deinit_options,
1209 git_submodule_helper_usage, 0);
1212 error("pathspec and --all are incompatible");
1213 usage_with_options(git_submodule_helper_usage,
1214 module_deinit_options);
1218 die(_("Use '--all' if you really want to deinitialize all submodules"));
1220 if (module_list_compute(argc, argv, prefix, &pathspec, &list) < 0)
1223 info.prefix = prefix;
1225 info.flags |= OPT_QUIET;
1227 info.flags |= OPT_FORCE;
1229 for_each_listed_submodule(&list, deinit_submodule_cb, &info);
1234 static int clone_submodule(const char *path, const char *gitdir, const char *url,
1235 const char *depth, struct string_list *reference, int dissociate,
1236 int quiet, int progress)
1238 struct child_process cp = CHILD_PROCESS_INIT;
1240 argv_array_push(&cp.args, "clone");
1241 argv_array_push(&cp.args, "--no-checkout");
1243 argv_array_push(&cp.args, "--quiet");
1245 argv_array_push(&cp.args, "--progress");
1246 if (depth && *depth)
1247 argv_array_pushl(&cp.args, "--depth", depth, NULL);
1248 if (reference->nr) {
1249 struct string_list_item *item;
1250 for_each_string_list_item(item, reference)
1251 argv_array_pushl(&cp.args, "--reference",
1252 item->string, NULL);
1255 argv_array_push(&cp.args, "--dissociate");
1256 if (gitdir && *gitdir)
1257 argv_array_pushl(&cp.args, "--separate-git-dir", gitdir, NULL);
1259 argv_array_push(&cp.args, "--");
1260 argv_array_push(&cp.args, url);
1261 argv_array_push(&cp.args, path);
1264 prepare_submodule_repo_env(&cp.env_array);
1267 return run_command(&cp);
1270 struct submodule_alternate_setup {
1271 const char *submodule_name;
1272 enum SUBMODULE_ALTERNATE_ERROR_MODE {
1273 SUBMODULE_ALTERNATE_ERROR_DIE,
1274 SUBMODULE_ALTERNATE_ERROR_INFO,
1275 SUBMODULE_ALTERNATE_ERROR_IGNORE
1277 struct string_list *reference;
1279 #define SUBMODULE_ALTERNATE_SETUP_INIT { NULL, \
1280 SUBMODULE_ALTERNATE_ERROR_IGNORE, NULL }
1282 static int add_possible_reference_from_superproject(
1283 struct object_directory *odb, void *sas_cb)
1285 struct submodule_alternate_setup *sas = sas_cb;
1289 * If the alternate object store is another repository, try the
1290 * standard layout with .git/(modules/<name>)+/objects
1292 if (strip_suffix(odb->path, "/objects", &len)) {
1294 struct strbuf sb = STRBUF_INIT;
1295 struct strbuf err = STRBUF_INIT;
1296 strbuf_add(&sb, odb->path, len);
1299 * We need to end the new path with '/' to mark it as a dir,
1300 * otherwise a submodule name containing '/' will be broken
1301 * as the last part of a missing submodule reference would
1302 * be taken as a file name.
1304 strbuf_addf(&sb, "/modules/%s/", sas->submodule_name);
1306 sm_alternate = compute_alternate_path(sb.buf, &err);
1308 string_list_append(sas->reference, xstrdup(sb.buf));
1311 switch (sas->error_mode) {
1312 case SUBMODULE_ALTERNATE_ERROR_DIE:
1313 die(_("submodule '%s' cannot add alternate: %s"),
1314 sas->submodule_name, err.buf);
1315 case SUBMODULE_ALTERNATE_ERROR_INFO:
1316 fprintf_ln(stderr, _("submodule '%s' cannot add alternate: %s"),
1317 sas->submodule_name, err.buf);
1318 case SUBMODULE_ALTERNATE_ERROR_IGNORE:
1322 strbuf_release(&sb);
1328 static void prepare_possible_alternates(const char *sm_name,
1329 struct string_list *reference)
1331 char *sm_alternate = NULL, *error_strategy = NULL;
1332 struct submodule_alternate_setup sas = SUBMODULE_ALTERNATE_SETUP_INIT;
1334 git_config_get_string("submodule.alternateLocation", &sm_alternate);
1338 git_config_get_string("submodule.alternateErrorStrategy", &error_strategy);
1340 if (!error_strategy)
1341 error_strategy = xstrdup("die");
1343 sas.submodule_name = sm_name;
1344 sas.reference = reference;
1345 if (!strcmp(error_strategy, "die"))
1346 sas.error_mode = SUBMODULE_ALTERNATE_ERROR_DIE;
1347 else if (!strcmp(error_strategy, "info"))
1348 sas.error_mode = SUBMODULE_ALTERNATE_ERROR_INFO;
1349 else if (!strcmp(error_strategy, "ignore"))
1350 sas.error_mode = SUBMODULE_ALTERNATE_ERROR_IGNORE;
1352 die(_("Value '%s' for submodule.alternateErrorStrategy is not recognized"), error_strategy);
1354 if (!strcmp(sm_alternate, "superproject"))
1355 foreach_alt_odb(add_possible_reference_from_superproject, &sas);
1356 else if (!strcmp(sm_alternate, "no"))
1359 die(_("Value '%s' for submodule.alternateLocation is not recognized"), sm_alternate);
1362 free(error_strategy);
1365 static int module_clone(int argc, const char **argv, const char *prefix)
1367 const char *name = NULL, *url = NULL, *depth = NULL;
1370 char *p, *path = NULL, *sm_gitdir;
1371 struct strbuf sb = STRBUF_INIT;
1372 struct string_list reference = STRING_LIST_INIT_NODUP;
1373 int dissociate = 0, require_init = 0;
1374 char *sm_alternate = NULL, *error_strategy = NULL;
1376 struct option module_clone_options[] = {
1377 OPT_STRING(0, "prefix", &prefix,
1379 N_("alternative anchor for relative paths")),
1380 OPT_STRING(0, "path", &path,
1382 N_("where the new submodule will be cloned to")),
1383 OPT_STRING(0, "name", &name,
1385 N_("name of the new submodule")),
1386 OPT_STRING(0, "url", &url,
1388 N_("url where to clone the submodule from")),
1389 OPT_STRING_LIST(0, "reference", &reference,
1391 N_("reference repository")),
1392 OPT_BOOL(0, "dissociate", &dissociate,
1393 N_("use --reference only while cloning")),
1394 OPT_STRING(0, "depth", &depth,
1396 N_("depth for shallow clones")),
1397 OPT__QUIET(&quiet, "Suppress output for cloning a submodule"),
1398 OPT_BOOL(0, "progress", &progress,
1399 N_("force cloning progress")),
1400 OPT_BOOL(0, "require-init", &require_init,
1401 N_("disallow cloning into non-empty directory")),
1405 const char *const git_submodule_helper_usage[] = {
1406 N_("git submodule--helper clone [--prefix=<path>] [--quiet] "
1407 "[--reference <repository>] [--name <name>] [--depth <depth>] "
1408 "--url <url> --path <path>"),
1412 argc = parse_options(argc, argv, prefix, module_clone_options,
1413 git_submodule_helper_usage, 0);
1415 if (argc || !url || !path || !*path)
1416 usage_with_options(git_submodule_helper_usage,
1417 module_clone_options);
1419 strbuf_addf(&sb, "%s/modules/%s", get_git_dir(), name);
1420 sm_gitdir = absolute_pathdup(sb.buf);
1423 if (!is_absolute_path(path)) {
1424 strbuf_addf(&sb, "%s/%s", get_git_work_tree(), path);
1425 path = strbuf_detach(&sb, NULL);
1427 path = xstrdup(path);
1429 if (validate_submodule_git_dir(sm_gitdir, name) < 0)
1430 die(_("refusing to create/use '%s' in another submodule's "
1431 "git dir"), sm_gitdir);
1433 if (!file_exists(sm_gitdir)) {
1434 if (safe_create_leading_directories_const(sm_gitdir) < 0)
1435 die(_("could not create directory '%s'"), sm_gitdir);
1437 prepare_possible_alternates(name, &reference);
1439 if (clone_submodule(path, sm_gitdir, url, depth, &reference, dissociate,
1441 die(_("clone of '%s' into submodule path '%s' failed"),
1444 if (require_init && !access(path, X_OK) && !is_empty_dir(path))
1445 die(_("directory not empty: '%s'"), path);
1446 if (safe_create_leading_directories_const(path) < 0)
1447 die(_("could not create directory '%s'"), path);
1448 strbuf_addf(&sb, "%s/index", sm_gitdir);
1449 unlink_or_warn(sb.buf);
1453 connect_work_tree_and_git_dir(path, sm_gitdir, 0);
1455 p = git_pathdup_submodule(path, "config");
1457 die(_("could not get submodule directory for '%s'"), path);
1459 /* setup alternateLocation and alternateErrorStrategy in the cloned submodule if needed */
1460 git_config_get_string("submodule.alternateLocation", &sm_alternate);
1462 git_config_set_in_file(p, "submodule.alternateLocation",
1464 git_config_get_string("submodule.alternateErrorStrategy", &error_strategy);
1466 git_config_set_in_file(p, "submodule.alternateErrorStrategy",
1470 free(error_strategy);
1472 strbuf_release(&sb);
1479 static void determine_submodule_update_strategy(struct repository *r,
1483 struct submodule_update_strategy *out)
1485 const struct submodule *sub = submodule_from_path(r, &null_oid, path);
1489 key = xstrfmt("submodule.%s.update", sub->name);
1492 if (parse_submodule_update_strategy(update, out) < 0)
1493 die(_("Invalid update mode '%s' for submodule path '%s'"),
1495 } else if (!repo_config_get_string_const(r, key, &val)) {
1496 if (parse_submodule_update_strategy(val, out) < 0)
1497 die(_("Invalid update mode '%s' configured for submodule path '%s'"),
1499 } else if (sub->update_strategy.type != SM_UPDATE_UNSPECIFIED) {
1500 if (sub->update_strategy.type == SM_UPDATE_COMMAND)
1501 BUG("how did we read update = !command from .gitmodules?");
1502 out->type = sub->update_strategy.type;
1503 out->command = sub->update_strategy.command;
1505 out->type = SM_UPDATE_CHECKOUT;
1508 (out->type == SM_UPDATE_MERGE ||
1509 out->type == SM_UPDATE_REBASE ||
1510 out->type == SM_UPDATE_NONE))
1511 out->type = SM_UPDATE_CHECKOUT;
1516 static int module_update_module_mode(int argc, const char **argv, const char *prefix)
1518 const char *path, *update = NULL;
1520 struct submodule_update_strategy update_strategy = { .type = SM_UPDATE_CHECKOUT };
1522 if (argc < 3 || argc > 4)
1523 die("submodule--helper update-module-clone expects <just-cloned> <path> [<update>]");
1525 just_cloned = git_config_int("just_cloned", argv[1]);
1531 determine_submodule_update_strategy(the_repository,
1532 just_cloned, path, update,
1534 fputs(submodule_strategy_to_string(&update_strategy), stdout);
1539 struct update_clone_data {
1540 const struct submodule *sub;
1541 struct object_id oid;
1542 unsigned just_cloned;
1545 struct submodule_update_clone {
1546 /* index into 'list', the list of submodules to look into for cloning */
1548 struct module_list list;
1549 unsigned warn_if_uninitialized : 1;
1551 /* update parameter passed via commandline */
1552 struct submodule_update_strategy update;
1554 /* configuration parameters which are passed on to the children */
1557 int recommend_shallow;
1558 struct string_list references;
1560 unsigned require_init;
1562 const char *recursive_prefix;
1565 /* to be consumed by git-submodule.sh */
1566 struct update_clone_data *update_clone;
1567 int update_clone_nr; int update_clone_alloc;
1569 /* If we want to stop as fast as possible and return an error */
1570 unsigned quickstop : 1;
1572 /* failed clones to be retried again */
1573 const struct cache_entry **failed_clones;
1574 int failed_clones_nr, failed_clones_alloc;
1578 #define SUBMODULE_UPDATE_CLONE_INIT {0, MODULE_LIST_INIT, 0, \
1579 SUBMODULE_UPDATE_STRATEGY_INIT, 0, 0, -1, STRING_LIST_INIT_DUP, 0, 0, \
1581 NULL, 0, 0, 0, NULL, 0, 0, 1}
1584 static void next_submodule_warn_missing(struct submodule_update_clone *suc,
1585 struct strbuf *out, const char *displaypath)
1588 * Only mention uninitialized submodules when their
1589 * paths have been specified.
1591 if (suc->warn_if_uninitialized) {
1593 _("Submodule path '%s' not initialized"),
1595 strbuf_addch(out, '\n');
1597 _("Maybe you want to use 'update --init'?"));
1598 strbuf_addch(out, '\n');
1603 * Determine whether 'ce' needs to be cloned. If so, prepare the 'child' to
1604 * run the clone. Returns 1 if 'ce' needs to be cloned, 0 otherwise.
1606 static int prepare_to_clone_next_submodule(const struct cache_entry *ce,
1607 struct child_process *child,
1608 struct submodule_update_clone *suc,
1611 const struct submodule *sub = NULL;
1612 const char *url = NULL;
1613 const char *update_string;
1614 enum submodule_update_type update_type;
1616 struct strbuf displaypath_sb = STRBUF_INIT;
1617 struct strbuf sb = STRBUF_INIT;
1618 const char *displaypath = NULL;
1619 int needs_cloning = 0;
1620 int need_free_url = 0;
1623 if (suc->recursive_prefix)
1624 strbuf_addf(&sb, "%s/%s", suc->recursive_prefix, ce->name);
1626 strbuf_addstr(&sb, ce->name);
1627 strbuf_addf(out, _("Skipping unmerged submodule %s"), sb.buf);
1628 strbuf_addch(out, '\n');
1632 sub = submodule_from_path(the_repository, &null_oid, ce->name);
1634 if (suc->recursive_prefix)
1635 displaypath = relative_path(suc->recursive_prefix,
1636 ce->name, &displaypath_sb);
1638 displaypath = ce->name;
1641 next_submodule_warn_missing(suc, out, displaypath);
1645 key = xstrfmt("submodule.%s.update", sub->name);
1646 if (!repo_config_get_string_const(the_repository, key, &update_string)) {
1647 update_type = parse_submodule_update_type(update_string);
1649 update_type = sub->update_strategy.type;
1653 if (suc->update.type == SM_UPDATE_NONE
1654 || (suc->update.type == SM_UPDATE_UNSPECIFIED
1655 && update_type == SM_UPDATE_NONE)) {
1656 strbuf_addf(out, _("Skipping submodule '%s'"), displaypath);
1657 strbuf_addch(out, '\n');
1661 /* Check if the submodule has been initialized. */
1662 if (!is_submodule_active(the_repository, ce->name)) {
1663 next_submodule_warn_missing(suc, out, displaypath);
1668 strbuf_addf(&sb, "submodule.%s.url", sub->name);
1669 if (repo_config_get_string_const(the_repository, sb.buf, &url)) {
1670 if (starts_with_dot_slash(sub->url) ||
1671 starts_with_dot_dot_slash(sub->url)) {
1672 url = compute_submodule_clone_url(sub->url);
1679 strbuf_addf(&sb, "%s/.git", ce->name);
1680 needs_cloning = !file_exists(sb.buf);
1682 ALLOC_GROW(suc->update_clone, suc->update_clone_nr + 1,
1683 suc->update_clone_alloc);
1684 oidcpy(&suc->update_clone[suc->update_clone_nr].oid, &ce->oid);
1685 suc->update_clone[suc->update_clone_nr].just_cloned = needs_cloning;
1686 suc->update_clone[suc->update_clone_nr].sub = sub;
1687 suc->update_clone_nr++;
1693 child->no_stdin = 1;
1694 child->stdout_to_stderr = 1;
1696 argv_array_push(&child->args, "submodule--helper");
1697 argv_array_push(&child->args, "clone");
1699 argv_array_push(&child->args, "--progress");
1701 argv_array_push(&child->args, "--quiet");
1703 argv_array_pushl(&child->args, "--prefix", suc->prefix, NULL);
1704 if (suc->recommend_shallow && sub->recommend_shallow == 1)
1705 argv_array_push(&child->args, "--depth=1");
1706 if (suc->require_init)
1707 argv_array_push(&child->args, "--require-init");
1708 argv_array_pushl(&child->args, "--path", sub->path, NULL);
1709 argv_array_pushl(&child->args, "--name", sub->name, NULL);
1710 argv_array_pushl(&child->args, "--url", url, NULL);
1711 if (suc->references.nr) {
1712 struct string_list_item *item;
1713 for_each_string_list_item(item, &suc->references)
1714 argv_array_pushl(&child->args, "--reference", item->string, NULL);
1716 if (suc->dissociate)
1717 argv_array_push(&child->args, "--dissociate");
1719 argv_array_push(&child->args, suc->depth);
1722 strbuf_reset(&displaypath_sb);
1727 return needs_cloning;
1730 static int update_clone_get_next_task(struct child_process *child,
1735 struct submodule_update_clone *suc = suc_cb;
1736 const struct cache_entry *ce;
1739 for (; suc->current < suc->list.nr; suc->current++) {
1740 ce = suc->list.entries[suc->current];
1741 if (prepare_to_clone_next_submodule(ce, child, suc, err)) {
1742 int *p = xmalloc(sizeof(*p));
1751 * The loop above tried cloning each submodule once, now try the
1752 * stragglers again, which we can imagine as an extension of the
1755 index = suc->current - suc->list.nr;
1756 if (index < suc->failed_clones_nr) {
1758 ce = suc->failed_clones[index];
1759 if (!prepare_to_clone_next_submodule(ce, child, suc, err)) {
1761 strbuf_addstr(err, "BUG: submodule considered for "
1762 "cloning, doesn't need cloning "
1766 p = xmalloc(sizeof(*p));
1776 static int update_clone_start_failure(struct strbuf *err,
1780 struct submodule_update_clone *suc = suc_cb;
1785 static int update_clone_task_finished(int result,
1790 const struct cache_entry *ce;
1791 struct submodule_update_clone *suc = suc_cb;
1793 int *idxP = idx_task_cb;
1800 if (idx < suc->list.nr) {
1801 ce = suc->list.entries[idx];
1802 strbuf_addf(err, _("Failed to clone '%s'. Retry scheduled"),
1804 strbuf_addch(err, '\n');
1805 ALLOC_GROW(suc->failed_clones,
1806 suc->failed_clones_nr + 1,
1807 suc->failed_clones_alloc);
1808 suc->failed_clones[suc->failed_clones_nr++] = ce;
1811 idx -= suc->list.nr;
1812 ce = suc->failed_clones[idx];
1813 strbuf_addf(err, _("Failed to clone '%s' a second time, aborting"),
1815 strbuf_addch(err, '\n');
1823 static int git_update_clone_config(const char *var, const char *value,
1827 if (!strcmp(var, "submodule.fetchjobs"))
1828 *max_jobs = parse_submodule_fetchjobs(var, value);
1832 static void update_submodule(struct update_clone_data *ucd)
1834 fprintf(stdout, "dummy %s %d\t%s\n",
1835 oid_to_hex(&ucd->oid),
1840 static int update_submodules(struct submodule_update_clone *suc)
1844 run_processes_parallel_tr2(suc->max_jobs, update_clone_get_next_task,
1845 update_clone_start_failure,
1846 update_clone_task_finished, suc, "submodule",
1850 * We saved the output and put it out all at once now.
1852 * - the listener does not have to interleave their (checkout)
1853 * work with our fetching. The writes involved in a
1854 * checkout involve more straightforward sequential I/O.
1855 * - the listener can avoid doing any work if fetching failed.
1860 for (i = 0; i < suc->update_clone_nr; i++)
1861 update_submodule(&suc->update_clone[i]);
1866 static int update_clone(int argc, const char **argv, const char *prefix)
1868 const char *update = NULL;
1869 struct pathspec pathspec;
1870 struct submodule_update_clone suc = SUBMODULE_UPDATE_CLONE_INIT;
1872 struct option module_update_clone_options[] = {
1873 OPT_STRING(0, "prefix", &prefix,
1875 N_("path into the working tree")),
1876 OPT_STRING(0, "recursive-prefix", &suc.recursive_prefix,
1878 N_("path into the working tree, across nested "
1879 "submodule boundaries")),
1880 OPT_STRING(0, "update", &update,
1882 N_("rebase, merge, checkout or none")),
1883 OPT_STRING_LIST(0, "reference", &suc.references, N_("repo"),
1884 N_("reference repository")),
1885 OPT_BOOL(0, "dissociate", &suc.dissociate,
1886 N_("use --reference only while cloning")),
1887 OPT_STRING(0, "depth", &suc.depth, "<depth>",
1888 N_("Create a shallow clone truncated to the "
1889 "specified number of revisions")),
1890 OPT_INTEGER('j', "jobs", &suc.max_jobs,
1891 N_("parallel jobs")),
1892 OPT_BOOL(0, "recommend-shallow", &suc.recommend_shallow,
1893 N_("whether the initial clone should follow the shallow recommendation")),
1894 OPT__QUIET(&suc.quiet, N_("don't print cloning progress")),
1895 OPT_BOOL(0, "progress", &suc.progress,
1896 N_("force cloning progress")),
1897 OPT_BOOL(0, "require-init", &suc.require_init,
1898 N_("disallow cloning into non-empty directory")),
1902 const char *const git_submodule_helper_usage[] = {
1903 N_("git submodule--helper update_clone [--prefix=<path>] [<path>...]"),
1906 suc.prefix = prefix;
1908 update_clone_config_from_gitmodules(&suc.max_jobs);
1909 git_config(git_update_clone_config, &suc.max_jobs);
1911 argc = parse_options(argc, argv, prefix, module_update_clone_options,
1912 git_submodule_helper_usage, 0);
1915 if (parse_submodule_update_strategy(update, &suc.update) < 0)
1916 die(_("bad value for update parameter"));
1918 if (module_list_compute(argc, argv, prefix, &pathspec, &suc.list) < 0)
1922 suc.warn_if_uninitialized = 1;
1924 return update_submodules(&suc);
1927 static int resolve_relative_path(int argc, const char **argv, const char *prefix)
1929 struct strbuf sb = STRBUF_INIT;
1931 die("submodule--helper relative-path takes exactly 2 arguments, got %d", argc);
1933 printf("%s", relative_path(argv[1], argv[2], &sb));
1934 strbuf_release(&sb);
1938 static const char *remote_submodule_branch(const char *path)
1940 const struct submodule *sub;
1941 const char *branch = NULL;
1944 sub = submodule_from_path(the_repository, &null_oid, path);
1948 key = xstrfmt("submodule.%s.branch", sub->name);
1949 if (repo_config_get_string_const(the_repository, key, &branch))
1950 branch = sub->branch;
1956 if (!strcmp(branch, ".")) {
1957 const char *refname = resolve_ref_unsafe("HEAD", 0, NULL, NULL);
1960 die(_("No such ref: %s"), "HEAD");
1963 if (!strcmp(refname, "HEAD"))
1964 die(_("Submodule (%s) branch configured to inherit "
1965 "branch from superproject, but the superproject "
1966 "is not on any branch"), sub->name);
1968 if (!skip_prefix(refname, "refs/heads/", &refname))
1969 die(_("Expecting a full ref name, got %s"), refname);
1976 static int resolve_remote_submodule_branch(int argc, const char **argv,
1980 struct strbuf sb = STRBUF_INIT;
1982 die("submodule--helper remote-branch takes exactly one arguments, got %d", argc);
1984 ret = remote_submodule_branch(argv[1]);
1986 die("submodule %s doesn't exist", argv[1]);
1989 strbuf_release(&sb);
1993 static int push_check(int argc, const char **argv, const char *prefix)
1995 struct remote *remote;
1996 const char *superproject_head;
1998 int detached_head = 0;
1999 struct object_id head_oid;
2002 die("submodule--helper push-check requires at least 2 arguments");
2005 * superproject's resolved head ref.
2006 * if HEAD then the superproject is in a detached head state, otherwise
2007 * it will be the resolved head ref.
2009 superproject_head = argv[1];
2012 /* Get the submodule's head ref and determine if it is detached */
2013 head = resolve_refdup("HEAD", 0, &head_oid, NULL);
2015 die(_("Failed to resolve HEAD as a valid ref."));
2016 if (!strcmp(head, "HEAD"))
2020 * The remote must be configured.
2021 * This is to avoid pushing to the exact same URL as the parent.
2023 remote = pushremote_get(argv[1]);
2024 if (!remote || remote->origin == REMOTE_UNCONFIGURED)
2025 die("remote '%s' not configured", argv[1]);
2027 /* Check the refspec */
2030 struct ref *local_refs = get_local_heads();
2031 struct refspec refspec = REFSPEC_INIT_PUSH;
2033 refspec_appendn(&refspec, argv + 2, argc - 2);
2035 for (i = 0; i < refspec.nr; i++) {
2036 const struct refspec_item *rs = &refspec.items[i];
2038 if (rs->pattern || rs->matching)
2041 /* LHS must match a single ref */
2042 switch (count_refspec_match(rs->src, local_refs, NULL)) {
2047 * If LHS matches 'HEAD' then we need to ensure
2048 * that it matches the same named branch
2049 * checked out in the superproject.
2051 if (!strcmp(rs->src, "HEAD")) {
2052 if (!detached_head &&
2053 !strcmp(head, superproject_head))
2055 die("HEAD does not match the named branch in the superproject");
2059 die("src refspec '%s' must name a ref",
2063 refspec_clear(&refspec);
2070 static int ensure_core_worktree(int argc, const char **argv, const char *prefix)
2072 const struct submodule *sub;
2075 struct repository subrepo;
2078 BUG("submodule--helper ensure-core-worktree <path>");
2082 sub = submodule_from_path(the_repository, &null_oid, path);
2084 BUG("We could get the submodule handle before?");
2086 if (repo_submodule_init(&subrepo, the_repository, sub))
2087 die(_("could not get a repository handle for submodule '%s'"), path);
2089 if (!repo_config_get_string(&subrepo, "core.worktree", &cw)) {
2090 char *cfg_file, *abs_path;
2091 const char *rel_path;
2092 struct strbuf sb = STRBUF_INIT;
2094 cfg_file = repo_git_path(&subrepo, "config");
2096 abs_path = absolute_pathdup(path);
2097 rel_path = relative_path(abs_path, subrepo.gitdir, &sb);
2099 git_config_set_in_file(cfg_file, "core.worktree", rel_path);
2103 strbuf_release(&sb);
2109 static int absorb_git_dirs(int argc, const char **argv, const char *prefix)
2112 struct pathspec pathspec;
2113 struct module_list list = MODULE_LIST_INIT;
2114 unsigned flags = ABSORB_GITDIR_RECURSE_SUBMODULES;
2116 struct option embed_gitdir_options[] = {
2117 OPT_STRING(0, "prefix", &prefix,
2119 N_("path into the working tree")),
2120 OPT_BIT(0, "--recursive", &flags, N_("recurse into submodules"),
2121 ABSORB_GITDIR_RECURSE_SUBMODULES),
2125 const char *const git_submodule_helper_usage[] = {
2126 N_("git submodule--helper absorb-git-dirs [<options>] [<path>...]"),
2130 argc = parse_options(argc, argv, prefix, embed_gitdir_options,
2131 git_submodule_helper_usage, 0);
2133 if (module_list_compute(argc, argv, prefix, &pathspec, &list) < 0)
2136 for (i = 0; i < list.nr; i++)
2137 absorb_git_dir_into_superproject(list.entries[i]->name, flags);
2142 static int is_active(int argc, const char **argv, const char *prefix)
2145 die("submodule--helper is-active takes exactly 1 argument");
2147 return !is_submodule_active(the_repository, argv[1]);
2151 * Exit non-zero if any of the submodule names given on the command line is
2152 * invalid. If no names are given, filter stdin to print only valid names
2153 * (which is primarily intended for testing).
2155 static int check_name(int argc, const char **argv, const char *prefix)
2159 if (check_submodule_name(*argv) < 0)
2163 struct strbuf buf = STRBUF_INIT;
2164 while (strbuf_getline(&buf, stdin) != EOF) {
2165 if (!check_submodule_name(buf.buf))
2166 printf("%s\n", buf.buf);
2168 strbuf_release(&buf);
2173 static int module_config(int argc, const char **argv, const char *prefix)
2176 CHECK_WRITEABLE = 1,
2180 struct option module_config_options[] = {
2181 OPT_CMDMODE(0, "check-writeable", &command,
2182 N_("check if it is safe to write to the .gitmodules file"),
2184 OPT_CMDMODE(0, "unset", &command,
2185 N_("unset the config in the .gitmodules file"),
2189 const char *const git_submodule_helper_usage[] = {
2190 N_("git submodule--helper config <name> [<value>]"),
2191 N_("git submodule--helper config --unset <name>"),
2192 N_("git submodule--helper config --check-writeable"),
2196 argc = parse_options(argc, argv, prefix, module_config_options,
2197 git_submodule_helper_usage, PARSE_OPT_KEEP_ARGV0);
2199 if (argc == 1 && command == CHECK_WRITEABLE)
2200 return is_writing_gitmodules_ok() ? 0 : -1;
2202 /* Equivalent to ACTION_GET in builtin/config.c */
2203 if (argc == 2 && command != DO_UNSET)
2204 return print_config_from_gitmodules(the_repository, argv[1]);
2206 /* Equivalent to ACTION_SET in builtin/config.c */
2207 if (argc == 3 || (argc == 2 && command == DO_UNSET)) {
2208 const char *value = (argc == 3) ? argv[2] : NULL;
2210 if (!is_writing_gitmodules_ok())
2211 die(_("please make sure that the .gitmodules file is in the working tree"));
2213 return config_set_in_gitmodules_file_gently(argv[1], value);
2216 usage_with_options(git_submodule_helper_usage, module_config_options);
2219 #define SUPPORT_SUPER_PREFIX (1<<0)
2223 int (*fn)(int, const char **, const char *);
2227 static struct cmd_struct commands[] = {
2228 {"list", module_list, 0},
2229 {"name", module_name, 0},
2230 {"clone", module_clone, 0},
2231 {"update-module-mode", module_update_module_mode, 0},
2232 {"update-clone", update_clone, 0},
2233 {"ensure-core-worktree", ensure_core_worktree, 0},
2234 {"relative-path", resolve_relative_path, 0},
2235 {"resolve-relative-url", resolve_relative_url, 0},
2236 {"resolve-relative-url-test", resolve_relative_url_test, 0},
2237 {"foreach", module_foreach, SUPPORT_SUPER_PREFIX},
2238 {"init", module_init, SUPPORT_SUPER_PREFIX},
2239 {"status", module_status, SUPPORT_SUPER_PREFIX},
2240 {"print-default-remote", print_default_remote, 0},
2241 {"sync", module_sync, SUPPORT_SUPER_PREFIX},
2242 {"deinit", module_deinit, 0},
2243 {"remote-branch", resolve_remote_submodule_branch, 0},
2244 {"push-check", push_check, 0},
2245 {"absorb-git-dirs", absorb_git_dirs, SUPPORT_SUPER_PREFIX},
2246 {"is-active", is_active, 0},
2247 {"check-name", check_name, 0},
2248 {"config", module_config, 0},
2251 int cmd_submodule__helper(int argc, const char **argv, const char *prefix)
2254 if (argc < 2 || !strcmp(argv[1], "-h"))
2255 usage("git submodule--helper <command>");
2257 for (i = 0; i < ARRAY_SIZE(commands); i++) {
2258 if (!strcmp(argv[1], commands[i].cmd)) {
2259 if (get_super_prefix() &&
2260 !(commands[i].option & SUPPORT_SUPER_PREFIX))
2261 die(_("%s doesn't support --super-prefix"),
2263 return commands[i].fn(argc - 1, argv + 1, prefix);
2267 die(_("'%s' is not a valid submodule--helper "
2268 "subcommand"), argv[1]);