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"
25 #define OPT_QUIET (1 << 0)
26 #define OPT_CACHED (1 << 1)
27 #define OPT_RECURSIVE (1 << 2)
28 #define OPT_FORCE (1 << 3)
30 typedef void (*each_submodule_fn)(const struct cache_entry *list_item,
33 static char *get_default_remote(void)
35 char *dest = NULL, *ret;
36 struct strbuf sb = STRBUF_INIT;
37 const char *refname = resolve_ref_unsafe("HEAD", 0, NULL, NULL);
40 die(_("No such ref: %s"), "HEAD");
43 if (!strcmp(refname, "HEAD"))
44 return xstrdup("origin");
46 if (!skip_prefix(refname, "refs/heads/", &refname))
47 die(_("Expecting a full ref name, got %s"), refname);
49 strbuf_addf(&sb, "branch.%s.remote", refname);
50 if (git_config_get_string(sb.buf, &dest))
51 ret = xstrdup("origin");
59 static int print_default_remote(int argc, const char **argv, const char *prefix)
64 die(_("submodule--helper print-default-remote takes no arguments"));
66 remote = get_default_remote();
68 printf("%s\n", remote);
74 static int starts_with_dot_slash(const char *str)
76 return str[0] == '.' && is_dir_sep(str[1]);
79 static int starts_with_dot_dot_slash(const char *str)
81 return str[0] == '.' && str[1] == '.' && is_dir_sep(str[2]);
85 * Returns 1 if it was the last chop before ':'.
87 static int chop_last_dir(char **remoteurl, int is_relative)
89 char *rfind = find_last_dir_sep(*remoteurl);
95 rfind = strrchr(*remoteurl, ':');
101 if (is_relative || !strcmp(".", *remoteurl))
102 die(_("cannot strip one component off url '%s'"),
106 *remoteurl = xstrdup(".");
111 * The `url` argument is the URL that navigates to the submodule origin
112 * repo. When relative, this URL is relative to the superproject origin
113 * URL repo. The `up_path` argument, if specified, is the relative
114 * path that navigates from the submodule working tree to the superproject
115 * working tree. Returns the origin URL of the submodule.
117 * Return either an absolute URL or filesystem path (if the superproject
118 * origin URL is an absolute URL or filesystem path, respectively) or a
119 * relative file system path (if the superproject origin URL is a relative
122 * When the output is a relative file system path, the path is either
123 * relative to the submodule working tree, if up_path is specified, or to
124 * the superproject working tree otherwise.
126 * NEEDSWORK: This works incorrectly on the domain and protocol part.
127 * remote_url url outcome expectation
128 * http://a.com/b ../c http://a.com/c as is
129 * http://a.com/b/ ../c http://a.com/c same as previous line, but
130 * ignore trailing slash in url
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 http:c error out
134 * http://a.com/b ../../../../../c .:c error out
135 * NEEDSWORK: Given how chop_last_dir() works, this function is broken
136 * when a local part has a colon in its path component, too.
138 static char *relative_url(const char *remote_url,
145 char *remoteurl = xstrdup(remote_url);
146 struct strbuf sb = STRBUF_INIT;
147 size_t len = strlen(remoteurl);
149 if (is_dir_sep(remoteurl[len-1]))
150 remoteurl[len-1] = '\0';
152 if (!url_is_local_not_ssh(remoteurl) || is_absolute_path(remoteurl))
157 * Prepend a './' to ensure all relative
158 * remoteurls start with './' or '../'
160 if (!starts_with_dot_slash(remoteurl) &&
161 !starts_with_dot_dot_slash(remoteurl)) {
163 strbuf_addf(&sb, "./%s", remoteurl);
165 remoteurl = strbuf_detach(&sb, NULL);
169 * When the url starts with '../', remove that and the
170 * last directory in remoteurl.
173 if (starts_with_dot_dot_slash(url)) {
175 colonsep |= chop_last_dir(&remoteurl, is_relative);
176 } else if (starts_with_dot_slash(url))
182 strbuf_addf(&sb, "%s%s%s", remoteurl, colonsep ? ":" : "/", url);
183 if (ends_with(url, "/"))
184 strbuf_setlen(&sb, sb.len - 1);
187 if (starts_with_dot_slash(sb.buf))
188 out = xstrdup(sb.buf + 2);
190 out = xstrdup(sb.buf);
193 if (!up_path || !is_relative)
196 strbuf_addf(&sb, "%s%s", up_path, out);
198 return strbuf_detach(&sb, NULL);
201 static int resolve_relative_url(int argc, const char **argv, const char *prefix)
203 char *remoteurl = NULL;
204 char *remote = get_default_remote();
205 const char *up_path = NULL;
208 struct strbuf sb = STRBUF_INIT;
210 if (argc != 2 && argc != 3)
211 die("resolve-relative-url only accepts one or two arguments");
214 strbuf_addf(&sb, "remote.%s.url", remote);
217 if (git_config_get_string(sb.buf, &remoteurl))
218 /* the repository is its own authoritative upstream */
219 remoteurl = xgetcwd();
224 res = relative_url(remoteurl, url, up_path);
231 static int resolve_relative_url_test(int argc, const char **argv, const char *prefix)
233 char *remoteurl, *res;
234 const char *up_path, *url;
237 die("resolve-relative-url-test only accepts three arguments: <up_path> <remoteurl> <url>");
240 remoteurl = xstrdup(argv[2]);
243 if (!strcmp(up_path, "(null)"))
246 res = relative_url(remoteurl, url, up_path);
253 /* the result should be freed by the caller. */
254 static char *get_submodule_displaypath(const char *path, const char *prefix)
256 const char *super_prefix = get_super_prefix();
258 if (prefix && super_prefix) {
259 BUG("cannot have prefix '%s' and superprefix '%s'",
260 prefix, super_prefix);
262 struct strbuf sb = STRBUF_INIT;
263 char *displaypath = xstrdup(relative_path(path, prefix, &sb));
266 } else if (super_prefix) {
267 return xstrfmt("%s%s", super_prefix, path);
269 return xstrdup(path);
273 static char *compute_rev_name(const char *sub_path, const char* object_id)
275 struct strbuf sb = STRBUF_INIT;
278 static const char *describe_bare[] = { NULL };
280 static const char *describe_tags[] = { "--tags", NULL };
282 static const char *describe_contains[] = { "--contains", NULL };
284 static const char *describe_all_always[] = { "--all", "--always", NULL };
286 static const char **describe_argv[] = { describe_bare, describe_tags,
288 describe_all_always, NULL };
290 for (d = describe_argv; *d; d++) {
291 struct child_process cp = CHILD_PROCESS_INIT;
292 prepare_submodule_repo_env(&cp.env_array);
297 strvec_push(&cp.args, "describe");
298 strvec_pushv(&cp.args, *d);
299 strvec_push(&cp.args, object_id);
301 if (!capture_command(&cp, &sb, 0)) {
302 strbuf_strip_suffix(&sb, "\n");
303 return strbuf_detach(&sb, NULL);
312 const struct cache_entry **entries;
315 #define MODULE_LIST_INIT { NULL, 0, 0 }
317 static int module_list_compute(int argc, const char **argv,
319 struct pathspec *pathspec,
320 struct module_list *list)
323 char *ps_matched = NULL;
324 parse_pathspec(pathspec, 0,
325 PATHSPEC_PREFER_FULL,
329 ps_matched = xcalloc(pathspec->nr, 1);
331 if (read_cache() < 0)
332 die(_("index file corrupt"));
334 for (i = 0; i < active_nr; i++) {
335 const struct cache_entry *ce = active_cache[i];
337 if (!match_pathspec(&the_index, pathspec, ce->name, ce_namelen(ce),
339 !S_ISGITLINK(ce->ce_mode))
342 ALLOC_GROW(list->entries, list->nr + 1, list->alloc);
343 list->entries[list->nr++] = ce;
344 while (i + 1 < active_nr &&
345 !strcmp(ce->name, active_cache[i + 1]->name))
347 * Skip entries with the same name in different stages
348 * to make sure an entry is returned only once.
353 if (ps_matched && report_path_error(ps_matched, pathspec))
361 static void module_list_active(struct module_list *list)
364 struct module_list active_modules = MODULE_LIST_INIT;
366 for (i = 0; i < list->nr; i++) {
367 const struct cache_entry *ce = list->entries[i];
369 if (!is_submodule_active(the_repository, ce->name))
372 ALLOC_GROW(active_modules.entries,
373 active_modules.nr + 1,
374 active_modules.alloc);
375 active_modules.entries[active_modules.nr++] = ce;
379 *list = active_modules;
382 static char *get_up_path(const char *path)
385 struct strbuf sb = STRBUF_INIT;
387 for (i = count_slashes(path); i; i--)
388 strbuf_addstr(&sb, "../");
391 * Check if 'path' ends with slash or not
392 * for having the same output for dir/sub_dir
395 if (!is_dir_sep(path[strlen(path) - 1]))
396 strbuf_addstr(&sb, "../");
398 return strbuf_detach(&sb, NULL);
401 static int module_list(int argc, const char **argv, const char *prefix)
404 struct pathspec pathspec;
405 struct module_list list = MODULE_LIST_INIT;
407 struct option module_list_options[] = {
408 OPT_STRING(0, "prefix", &prefix,
410 N_("alternative anchor for relative paths")),
414 const char *const git_submodule_helper_usage[] = {
415 N_("git submodule--helper list [--prefix=<path>] [<path>...]"),
419 argc = parse_options(argc, argv, prefix, module_list_options,
420 git_submodule_helper_usage, 0);
422 if (module_list_compute(argc, argv, prefix, &pathspec, &list) < 0)
425 for (i = 0; i < list.nr; i++) {
426 const struct cache_entry *ce = list.entries[i];
429 printf("%06o %s U\t", ce->ce_mode,
430 oid_to_hex(null_oid()));
432 printf("%06o %s %d\t", ce->ce_mode,
433 oid_to_hex(&ce->oid), ce_stage(ce));
435 fprintf(stdout, "%s\n", ce->name);
440 static void for_each_listed_submodule(const struct module_list *list,
441 each_submodule_fn fn, void *cb_data)
444 for (i = 0; i < list->nr; i++)
445 fn(list->entries[i], cb_data);
455 #define FOREACH_CB_INIT { 0 }
457 static void runcommand_in_submodule_cb(const struct cache_entry *list_item,
460 struct foreach_cb *info = cb_data;
461 const char *path = list_item->name;
462 const struct object_id *ce_oid = &list_item->oid;
464 const struct submodule *sub;
465 struct child_process cp = CHILD_PROCESS_INIT;
468 displaypath = get_submodule_displaypath(path, info->prefix);
470 sub = submodule_from_path(the_repository, null_oid(), path);
473 die(_("No url found for submodule path '%s' in .gitmodules"),
476 if (!is_submodule_populated_gently(path, NULL))
479 prepare_submodule_repo_env(&cp.env_array);
482 * For the purpose of executing <command> in the submodule,
483 * separate shell is used for the purpose of running the
490 * NEEDSWORK: the command currently has access to the variables $name,
491 * $sm_path, $displaypath, $sha1 and $toplevel only when the command
492 * contains a single argument. This is done for maintaining a faithful
493 * translation from shell script.
495 if (info->argc == 1) {
496 char *toplevel = xgetcwd();
497 struct strbuf sb = STRBUF_INIT;
499 strvec_pushf(&cp.env_array, "name=%s", sub->name);
500 strvec_pushf(&cp.env_array, "sm_path=%s", path);
501 strvec_pushf(&cp.env_array, "displaypath=%s", displaypath);
502 strvec_pushf(&cp.env_array, "sha1=%s",
504 strvec_pushf(&cp.env_array, "toplevel=%s", toplevel);
507 * Since the path variable was accessible from the script
508 * before porting, it is also made available after porting.
509 * The environment variable "PATH" has a very special purpose
510 * on windows. And since environment variables are
511 * case-insensitive in windows, it interferes with the
512 * existing PATH variable. Hence, to avoid that, we expose
513 * path via the args strvec and not via env_array.
515 sq_quote_buf(&sb, path);
516 strvec_pushf(&cp.args, "path=%s; %s",
517 sb.buf, info->argv[0]);
521 strvec_pushv(&cp.args, info->argv);
525 printf(_("Entering '%s'\n"), displaypath);
527 if (info->argv[0] && run_command(&cp))
528 die(_("run_command returned non-zero status for %s\n."),
531 if (info->recursive) {
532 struct child_process cpr = CHILD_PROCESS_INIT;
536 prepare_submodule_repo_env(&cpr.env_array);
538 strvec_pushl(&cpr.args, "--super-prefix", NULL);
539 strvec_pushf(&cpr.args, "%s/", displaypath);
540 strvec_pushl(&cpr.args, "submodule--helper", "foreach", "--recursive",
544 strvec_push(&cpr.args, "--quiet");
546 strvec_push(&cpr.args, "--");
547 strvec_pushv(&cpr.args, info->argv);
549 if (run_command(&cpr))
550 die(_("run_command returned non-zero status while "
551 "recursing in the nested submodules of %s\n."),
559 static int module_foreach(int argc, const char **argv, const char *prefix)
561 struct foreach_cb info = FOREACH_CB_INIT;
562 struct pathspec pathspec;
563 struct module_list list = MODULE_LIST_INIT;
565 struct option module_foreach_options[] = {
566 OPT__QUIET(&info.quiet, N_("suppress output of entering each submodule command")),
567 OPT_BOOL(0, "recursive", &info.recursive,
568 N_("recurse into nested submodules")),
572 const char *const git_submodule_helper_usage[] = {
573 N_("git submodule--helper foreach [--quiet] [--recursive] [--] <command>"),
577 argc = parse_options(argc, argv, prefix, module_foreach_options,
578 git_submodule_helper_usage, 0);
580 if (module_list_compute(0, NULL, prefix, &pathspec, &list) < 0)
585 info.prefix = prefix;
587 for_each_listed_submodule(&list, runcommand_in_submodule_cb, &info);
592 static char *compute_submodule_clone_url(const char *rel_url)
594 char *remoteurl, *relurl;
595 char *remote = get_default_remote();
596 struct strbuf remotesb = STRBUF_INIT;
598 strbuf_addf(&remotesb, "remote.%s.url", remote);
599 if (git_config_get_string(remotesb.buf, &remoteurl)) {
600 warning(_("could not look up configuration '%s'. Assuming this repository is its own authoritative upstream."), remotesb.buf);
601 remoteurl = xgetcwd();
603 relurl = relative_url(remoteurl, rel_url, NULL);
607 strbuf_release(&remotesb);
616 #define INIT_CB_INIT { NULL, 0 }
618 static void init_submodule(const char *path, const char *prefix,
621 const struct submodule *sub;
622 struct strbuf sb = STRBUF_INIT;
623 char *upd = NULL, *url = NULL, *displaypath;
625 displaypath = get_submodule_displaypath(path, prefix);
627 sub = submodule_from_path(the_repository, null_oid(), path);
630 die(_("No url found for submodule path '%s' in .gitmodules"),
634 * NEEDSWORK: In a multi-working-tree world, this needs to be
635 * set in the per-worktree config.
637 * Set active flag for the submodule being initialized
639 if (!is_submodule_active(the_repository, path)) {
640 strbuf_addf(&sb, "submodule.%s.active", sub->name);
641 git_config_set_gently(sb.buf, "true");
646 * Copy url setting when it is not set yet.
647 * To look up the url in .git/config, we must not fall back to
648 * .gitmodules, so look it up directly.
650 strbuf_addf(&sb, "submodule.%s.url", sub->name);
651 if (git_config_get_string(sb.buf, &url)) {
653 die(_("No url found for submodule path '%s' in .gitmodules"),
656 url = xstrdup(sub->url);
658 /* Possibly a url relative to parent */
659 if (starts_with_dot_dot_slash(url) ||
660 starts_with_dot_slash(url)) {
662 url = compute_submodule_clone_url(oldurl);
666 if (git_config_set_gently(sb.buf, url))
667 die(_("Failed to register url for submodule path '%s'"),
669 if (!(flags & OPT_QUIET))
671 _("Submodule '%s' (%s) registered for path '%s'\n"),
672 sub->name, url, displaypath);
676 /* Copy "update" setting when it is not set yet */
677 strbuf_addf(&sb, "submodule.%s.update", sub->name);
678 if (git_config_get_string(sb.buf, &upd) &&
679 sub->update_strategy.type != SM_UPDATE_UNSPECIFIED) {
680 if (sub->update_strategy.type == SM_UPDATE_COMMAND) {
681 fprintf(stderr, _("warning: command update mode suggested for submodule '%s'\n"),
683 upd = xstrdup("none");
685 upd = xstrdup(submodule_strategy_to_string(&sub->update_strategy));
687 if (git_config_set_gently(sb.buf, upd))
688 die(_("Failed to register update mode for submodule path '%s'"), displaypath);
696 static void init_submodule_cb(const struct cache_entry *list_item, void *cb_data)
698 struct init_cb *info = cb_data;
699 init_submodule(list_item->name, info->prefix, info->flags);
702 static int module_init(int argc, const char **argv, const char *prefix)
704 struct init_cb info = INIT_CB_INIT;
705 struct pathspec pathspec;
706 struct module_list list = MODULE_LIST_INIT;
709 struct option module_init_options[] = {
710 OPT__QUIET(&quiet, N_("suppress output for initializing a submodule")),
714 const char *const git_submodule_helper_usage[] = {
715 N_("git submodule--helper init [<options>] [<path>]"),
719 argc = parse_options(argc, argv, prefix, module_init_options,
720 git_submodule_helper_usage, 0);
722 if (module_list_compute(argc, argv, prefix, &pathspec, &list) < 0)
726 * If there are no path args and submodule.active is set then,
727 * by default, only initialize 'active' modules.
729 if (!argc && git_config_get_value_multi("submodule.active"))
730 module_list_active(&list);
732 info.prefix = prefix;
734 info.flags |= OPT_QUIET;
736 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 strvec diff_files_args = STRVEC_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 strvec_pushl(&diff_files_args, "diff-files",
812 "--ignore-submodules=dirty", "--quiet", "--",
815 git_config(git_diff_basic_config, NULL);
817 repo_init_revisions(the_repository, &rev, NULL);
819 diff_files_args.nr = setup_revisions(diff_files_args.nr,
822 diff_files_result = run_diff_files(&rev, 0);
824 if (!diff_result_code(&rev.diffopt, diff_files_result)) {
825 print_status(flags, ' ', path, ce_oid,
827 } else if (!(flags & OPT_CACHED)) {
828 struct object_id oid;
829 struct ref_store *refs = get_submodule_ref_store(path);
832 print_status(flags, '-', path, ce_oid, displaypath);
835 if (refs_head_ref(refs, handle_submodule_head_ref, &oid))
836 die(_("could not resolve HEAD ref inside the "
837 "submodule '%s'"), path);
839 print_status(flags, '+', path, &oid, displaypath);
841 print_status(flags, '+', path, ce_oid, displaypath);
844 if (flags & OPT_RECURSIVE) {
845 struct child_process cpr = CHILD_PROCESS_INIT;
849 prepare_submodule_repo_env(&cpr.env_array);
851 strvec_push(&cpr.args, "--super-prefix");
852 strvec_pushf(&cpr.args, "%s/", displaypath);
853 strvec_pushl(&cpr.args, "submodule--helper", "status",
854 "--recursive", NULL);
856 if (flags & OPT_CACHED)
857 strvec_push(&cpr.args, "--cached");
859 if (flags & OPT_QUIET)
860 strvec_push(&cpr.args, "--quiet");
862 if (run_command(&cpr))
863 die(_("failed to recurse into submodule '%s'"), path);
867 strvec_clear(&diff_files_args);
871 static void status_submodule_cb(const struct cache_entry *list_item,
874 struct status_cb *info = cb_data;
875 status_submodule(list_item->name, &list_item->oid, list_item->ce_flags,
876 info->prefix, info->flags);
879 static int module_status(int argc, const char **argv, const char *prefix)
881 struct status_cb info = STATUS_CB_INIT;
882 struct pathspec pathspec;
883 struct module_list list = MODULE_LIST_INIT;
886 struct option module_status_options[] = {
887 OPT__QUIET(&quiet, N_("suppress submodule status output")),
888 OPT_BIT(0, "cached", &info.flags, N_("use commit stored in the index instead of the one stored in the submodule HEAD"), OPT_CACHED),
889 OPT_BIT(0, "recursive", &info.flags, N_("recurse into nested submodules"), OPT_RECURSIVE),
893 const char *const git_submodule_helper_usage[] = {
894 N_("git submodule status [--quiet] [--cached] [--recursive] [<path>...]"),
898 argc = parse_options(argc, argv, prefix, module_status_options,
899 git_submodule_helper_usage, 0);
901 if (module_list_compute(argc, argv, prefix, &pathspec, &list) < 0)
904 info.prefix = prefix;
906 info.flags |= OPT_QUIET;
908 for_each_listed_submodule(&list, status_submodule_cb, &info);
913 static int module_name(int argc, const char **argv, const char *prefix)
915 const struct submodule *sub;
918 usage(_("git submodule--helper name <path>"));
920 sub = submodule_from_path(the_repository, null_oid(), argv[1]);
923 die(_("no submodule mapping found in .gitmodules for path '%s'"),
926 printf("%s\n", sub->name);
932 unsigned int mod_src;
933 unsigned int mod_dst;
934 struct object_id oid_src;
935 struct object_id oid_dst;
939 #define MODULE_CB_INIT { 0, 0, NULL, NULL, '\0', NULL }
941 struct module_cb_list {
942 struct module_cb **entries;
945 #define MODULE_CB_LIST_INIT { NULL, 0, 0 }
951 unsigned int cached: 1;
952 unsigned int for_status: 1;
953 unsigned int files: 1;
956 #define SUMMARY_CB_INIT { 0, NULL, NULL, 0, 0, 0, 0 }
963 static char *verify_submodule_committish(const char *sm_path,
964 const char *committish)
966 struct child_process cp_rev_parse = CHILD_PROCESS_INIT;
967 struct strbuf result = STRBUF_INIT;
969 cp_rev_parse.git_cmd = 1;
970 cp_rev_parse.dir = sm_path;
971 prepare_submodule_repo_env(&cp_rev_parse.env_array);
972 strvec_pushl(&cp_rev_parse.args, "rev-parse", "-q", "--short", NULL);
973 strvec_pushf(&cp_rev_parse.args, "%s^0", committish);
974 strvec_push(&cp_rev_parse.args, "--");
976 if (capture_command(&cp_rev_parse, &result, 0))
979 strbuf_trim_trailing_newline(&result);
980 return strbuf_detach(&result, NULL);
983 static void print_submodule_summary(struct summary_cb *info, char *errmsg,
984 int total_commits, const char *displaypath,
985 const char *src_abbrev, const char *dst_abbrev,
988 if (p->status == 'T') {
989 if (S_ISGITLINK(p->mod_dst))
990 printf(_("* %s %s(blob)->%s(submodule)"),
991 displaypath, src_abbrev, dst_abbrev);
993 printf(_("* %s %s(submodule)->%s(blob)"),
994 displaypath, src_abbrev, dst_abbrev);
996 printf("* %s %s...%s",
997 displaypath, src_abbrev, dst_abbrev);
1000 if (total_commits < 0)
1003 printf(" (%d):\n", total_commits);
1006 printf(_("%s"), errmsg);
1007 } else if (total_commits > 0) {
1008 struct child_process cp_log = CHILD_PROCESS_INIT;
1011 cp_log.dir = p->sm_path;
1012 prepare_submodule_repo_env(&cp_log.env_array);
1013 strvec_pushl(&cp_log.args, "log", NULL);
1015 if (S_ISGITLINK(p->mod_src) && S_ISGITLINK(p->mod_dst)) {
1016 if (info->summary_limit > 0)
1017 strvec_pushf(&cp_log.args, "-%d",
1018 info->summary_limit);
1020 strvec_pushl(&cp_log.args, "--pretty= %m %s",
1021 "--first-parent", NULL);
1022 strvec_pushf(&cp_log.args, "%s...%s",
1023 src_abbrev, dst_abbrev);
1024 } else if (S_ISGITLINK(p->mod_dst)) {
1025 strvec_pushl(&cp_log.args, "--pretty= > %s",
1026 "-1", dst_abbrev, NULL);
1028 strvec_pushl(&cp_log.args, "--pretty= < %s",
1029 "-1", src_abbrev, NULL);
1031 run_command(&cp_log);
1036 static void generate_submodule_summary(struct summary_cb *info,
1037 struct module_cb *p)
1039 char *displaypath, *src_abbrev = NULL, *dst_abbrev;
1040 int missing_src = 0, missing_dst = 0;
1041 char *errmsg = NULL;
1042 int total_commits = -1;
1044 if (!info->cached && oideq(&p->oid_dst, null_oid())) {
1045 if (S_ISGITLINK(p->mod_dst)) {
1046 struct ref_store *refs = get_submodule_ref_store(p->sm_path);
1048 refs_head_ref(refs, handle_submodule_head_ref, &p->oid_dst);
1049 } else if (S_ISLNK(p->mod_dst) || S_ISREG(p->mod_dst)) {
1051 int fd = open(p->sm_path, O_RDONLY);
1053 if (fd < 0 || fstat(fd, &st) < 0 ||
1054 index_fd(&the_index, &p->oid_dst, fd, &st, OBJ_BLOB,
1056 error(_("couldn't hash object from '%s'"), p->sm_path);
1058 /* for a submodule removal (mode:0000000), don't warn */
1060 warning(_("unexpected mode %o\n"), p->mod_dst);
1064 if (S_ISGITLINK(p->mod_src)) {
1065 if (p->status != 'D')
1066 src_abbrev = verify_submodule_committish(p->sm_path,
1067 oid_to_hex(&p->oid_src));
1071 * As `rev-parse` failed, we fallback to getting
1072 * the abbreviated hash using oid_src. We do
1073 * this as we might still need the abbreviated
1074 * hash in cases like a submodule type change, etc.
1076 src_abbrev = xstrndup(oid_to_hex(&p->oid_src), 7);
1080 * The source does not point to a submodule.
1081 * So, we fallback to getting the abbreviation using
1082 * oid_src as we might still need the abbreviated
1083 * hash in cases like submodule add, etc.
1085 src_abbrev = xstrndup(oid_to_hex(&p->oid_src), 7);
1088 if (S_ISGITLINK(p->mod_dst)) {
1089 dst_abbrev = verify_submodule_committish(p->sm_path,
1090 oid_to_hex(&p->oid_dst));
1094 * As `rev-parse` failed, we fallback to getting
1095 * the abbreviated hash using oid_dst. We do
1096 * this as we might still need the abbreviated
1097 * hash in cases like a submodule type change, etc.
1099 dst_abbrev = xstrndup(oid_to_hex(&p->oid_dst), 7);
1103 * The destination does not point to a submodule.
1104 * So, we fallback to getting the abbreviation using
1105 * oid_dst as we might still need the abbreviated
1106 * hash in cases like a submodule removal, etc.
1108 dst_abbrev = xstrndup(oid_to_hex(&p->oid_dst), 7);
1111 displaypath = get_submodule_displaypath(p->sm_path, info->prefix);
1113 if (!missing_src && !missing_dst) {
1114 struct child_process cp_rev_list = CHILD_PROCESS_INIT;
1115 struct strbuf sb_rev_list = STRBUF_INIT;
1117 strvec_pushl(&cp_rev_list.args, "rev-list",
1118 "--first-parent", "--count", NULL);
1119 if (S_ISGITLINK(p->mod_src) && S_ISGITLINK(p->mod_dst))
1120 strvec_pushf(&cp_rev_list.args, "%s...%s",
1121 src_abbrev, dst_abbrev);
1123 strvec_push(&cp_rev_list.args, S_ISGITLINK(p->mod_src) ?
1124 src_abbrev : dst_abbrev);
1125 strvec_push(&cp_rev_list.args, "--");
1127 cp_rev_list.git_cmd = 1;
1128 cp_rev_list.dir = p->sm_path;
1129 prepare_submodule_repo_env(&cp_rev_list.env_array);
1131 if (!capture_command(&cp_rev_list, &sb_rev_list, 0))
1132 total_commits = atoi(sb_rev_list.buf);
1134 strbuf_release(&sb_rev_list);
1137 * Don't give error msg for modification whose dst is not
1138 * submodule, i.e., deleted or changed to blob
1140 if (S_ISGITLINK(p->mod_dst)) {
1141 struct strbuf errmsg_str = STRBUF_INIT;
1142 if (missing_src && missing_dst) {
1143 strbuf_addf(&errmsg_str, " Warn: %s doesn't contain commits %s and %s\n",
1144 displaypath, oid_to_hex(&p->oid_src),
1145 oid_to_hex(&p->oid_dst));
1147 strbuf_addf(&errmsg_str, " Warn: %s doesn't contain commit %s\n",
1148 displaypath, missing_src ?
1149 oid_to_hex(&p->oid_src) :
1150 oid_to_hex(&p->oid_dst));
1152 errmsg = strbuf_detach(&errmsg_str, NULL);
1156 print_submodule_summary(info, errmsg, total_commits,
1157 displaypath, src_abbrev,
1165 static void prepare_submodule_summary(struct summary_cb *info,
1166 struct module_cb_list *list)
1169 for (i = 0; i < list->nr; i++) {
1170 const struct submodule *sub;
1171 struct module_cb *p = list->entries[i];
1172 struct strbuf sm_gitdir = STRBUF_INIT;
1174 if (p->status == 'D' || p->status == 'T') {
1175 generate_submodule_summary(info, p);
1179 if (info->for_status && p->status != 'A' &&
1180 (sub = submodule_from_path(the_repository,
1181 null_oid(), p->sm_path))) {
1182 char *config_key = NULL;
1186 config_key = xstrfmt("submodule.%s.ignore",
1188 if (!git_config_get_string_tmp(config_key, &value))
1189 ignore_all = !strcmp(value, "all");
1190 else if (sub->ignore)
1191 ignore_all = !strcmp(sub->ignore, "all");
1198 /* Also show added or modified modules which are checked out */
1199 strbuf_addstr(&sm_gitdir, p->sm_path);
1200 if (is_nonbare_repository_dir(&sm_gitdir))
1201 generate_submodule_summary(info, p);
1202 strbuf_release(&sm_gitdir);
1206 static void submodule_summary_callback(struct diff_queue_struct *q,
1207 struct diff_options *options,
1211 struct module_cb_list *list = data;
1212 for (i = 0; i < q->nr; i++) {
1213 struct diff_filepair *p = q->queue[i];
1214 struct module_cb *temp;
1216 if (!S_ISGITLINK(p->one->mode) && !S_ISGITLINK(p->two->mode))
1218 temp = (struct module_cb*)malloc(sizeof(struct module_cb));
1219 temp->mod_src = p->one->mode;
1220 temp->mod_dst = p->two->mode;
1221 temp->oid_src = p->one->oid;
1222 temp->oid_dst = p->two->oid;
1223 temp->status = p->status;
1224 temp->sm_path = xstrdup(p->one->path);
1226 ALLOC_GROW(list->entries, list->nr + 1, list->alloc);
1227 list->entries[list->nr++] = temp;
1231 static const char *get_diff_cmd(enum diff_cmd diff_cmd)
1234 case DIFF_INDEX: return "diff-index";
1235 case DIFF_FILES: return "diff-files";
1236 default: BUG("bad diff_cmd value %d", diff_cmd);
1240 static int compute_summary_module_list(struct object_id *head_oid,
1241 struct summary_cb *info,
1242 enum diff_cmd diff_cmd)
1244 struct strvec diff_args = STRVEC_INIT;
1245 struct rev_info rev;
1246 struct module_cb_list list = MODULE_CB_LIST_INIT;
1248 strvec_push(&diff_args, get_diff_cmd(diff_cmd));
1250 strvec_push(&diff_args, "--cached");
1251 strvec_pushl(&diff_args, "--ignore-submodules=dirty", "--raw", NULL);
1253 strvec_push(&diff_args, oid_to_hex(head_oid));
1254 strvec_push(&diff_args, "--");
1256 strvec_pushv(&diff_args, info->argv);
1258 git_config(git_diff_basic_config, NULL);
1259 init_revisions(&rev, info->prefix);
1261 precompose_argv_prefix(diff_args.nr, diff_args.v, NULL);
1262 setup_revisions(diff_args.nr, diff_args.v, &rev, NULL);
1263 rev.diffopt.output_format = DIFF_FORMAT_NO_OUTPUT | DIFF_FORMAT_CALLBACK;
1264 rev.diffopt.format_callback = submodule_summary_callback;
1265 rev.diffopt.format_callback_data = &list;
1267 if (!info->cached) {
1268 if (diff_cmd == DIFF_INDEX)
1270 if (read_cache_preload(&rev.diffopt.pathspec) < 0) {
1271 perror("read_cache_preload");
1274 } else if (read_cache() < 0) {
1275 perror("read_cache");
1279 if (diff_cmd == DIFF_INDEX)
1280 run_diff_index(&rev, info->cached);
1282 run_diff_files(&rev, 0);
1283 prepare_submodule_summary(info, &list);
1284 strvec_clear(&diff_args);
1288 static int module_summary(int argc, const char **argv, const char *prefix)
1290 struct summary_cb info = SUMMARY_CB_INIT;
1294 int summary_limit = -1;
1295 enum diff_cmd diff_cmd = DIFF_INDEX;
1296 struct object_id head_oid;
1299 struct option module_summary_options[] = {
1300 OPT_BOOL(0, "cached", &cached,
1301 N_("use the commit stored in the index instead of the submodule HEAD")),
1302 OPT_BOOL(0, "files", &files,
1303 N_("compare the commit in the index with that in the submodule HEAD")),
1304 OPT_BOOL(0, "for-status", &for_status,
1305 N_("skip submodules with 'ignore_config' value set to 'all'")),
1306 OPT_INTEGER('n', "summary-limit", &summary_limit,
1307 N_("limit the summary size")),
1311 const char *const git_submodule_helper_usage[] = {
1312 N_("git submodule--helper summary [<options>] [<commit>] [--] [<path>]"),
1316 argc = parse_options(argc, argv, prefix, module_summary_options,
1317 git_submodule_helper_usage, 0);
1322 if (!get_oid(argc ? argv[0] : "HEAD", &head_oid)) {
1327 } else if (!argc || !strcmp(argv[0], "HEAD")) {
1328 /* before the first commit: compare with an empty tree */
1329 oidcpy(&head_oid, the_hash_algo->empty_tree);
1335 if (get_oid("HEAD", &head_oid))
1336 die(_("could not fetch a revision for HEAD"));
1341 die(_("--cached and --files are mutually exclusive"));
1342 diff_cmd = DIFF_FILES;
1347 info.prefix = prefix;
1348 info.cached = !!cached;
1349 info.files = !!files;
1350 info.for_status = !!for_status;
1351 info.summary_limit = summary_limit;
1353 ret = compute_summary_module_list((diff_cmd == DIFF_INDEX) ? &head_oid : NULL,
1362 #define SYNC_CB_INIT { NULL, 0 }
1364 static void sync_submodule(const char *path, const char *prefix,
1367 const struct submodule *sub;
1368 char *remote_key = NULL;
1369 char *sub_origin_url, *super_config_url, *displaypath;
1370 struct strbuf sb = STRBUF_INIT;
1371 struct child_process cp = CHILD_PROCESS_INIT;
1372 char *sub_config_path = NULL;
1374 if (!is_submodule_active(the_repository, path))
1377 sub = submodule_from_path(the_repository, null_oid(), path);
1379 if (sub && sub->url) {
1380 if (starts_with_dot_dot_slash(sub->url) ||
1381 starts_with_dot_slash(sub->url)) {
1382 char *remote_url, *up_path;
1383 char *remote = get_default_remote();
1384 strbuf_addf(&sb, "remote.%s.url", remote);
1386 if (git_config_get_string(sb.buf, &remote_url))
1387 remote_url = xgetcwd();
1389 up_path = get_up_path(path);
1390 sub_origin_url = relative_url(remote_url, sub->url, up_path);
1391 super_config_url = relative_url(remote_url, sub->url, NULL);
1397 sub_origin_url = xstrdup(sub->url);
1398 super_config_url = xstrdup(sub->url);
1401 sub_origin_url = xstrdup("");
1402 super_config_url = xstrdup("");
1405 displaypath = get_submodule_displaypath(path, prefix);
1407 if (!(flags & OPT_QUIET))
1408 printf(_("Synchronizing submodule url for '%s'\n"),
1412 strbuf_addf(&sb, "submodule.%s.url", sub->name);
1413 if (git_config_set_gently(sb.buf, super_config_url))
1414 die(_("failed to register url for submodule path '%s'"),
1417 if (!is_submodule_populated_gently(path, NULL))
1420 prepare_submodule_repo_env(&cp.env_array);
1423 strvec_pushl(&cp.args, "submodule--helper",
1424 "print-default-remote", NULL);
1427 if (capture_command(&cp, &sb, 0))
1428 die(_("failed to get the default remote for submodule '%s'"),
1431 strbuf_strip_suffix(&sb, "\n");
1432 remote_key = xstrfmt("remote.%s.url", sb.buf);
1435 submodule_to_gitdir(&sb, path);
1436 strbuf_addstr(&sb, "/config");
1438 if (git_config_set_in_file_gently(sb.buf, remote_key, sub_origin_url))
1439 die(_("failed to update remote for submodule '%s'"),
1442 if (flags & OPT_RECURSIVE) {
1443 struct child_process cpr = CHILD_PROCESS_INIT;
1447 prepare_submodule_repo_env(&cpr.env_array);
1449 strvec_push(&cpr.args, "--super-prefix");
1450 strvec_pushf(&cpr.args, "%s/", displaypath);
1451 strvec_pushl(&cpr.args, "submodule--helper", "sync",
1452 "--recursive", NULL);
1454 if (flags & OPT_QUIET)
1455 strvec_push(&cpr.args, "--quiet");
1457 if (run_command(&cpr))
1458 die(_("failed to recurse into submodule '%s'"),
1463 free(super_config_url);
1464 free(sub_origin_url);
1465 strbuf_release(&sb);
1468 free(sub_config_path);
1471 static void sync_submodule_cb(const struct cache_entry *list_item, void *cb_data)
1473 struct sync_cb *info = cb_data;
1474 sync_submodule(list_item->name, info->prefix, info->flags);
1477 static int module_sync(int argc, const char **argv, const char *prefix)
1479 struct sync_cb info = SYNC_CB_INIT;
1480 struct pathspec pathspec;
1481 struct module_list list = MODULE_LIST_INIT;
1485 struct option module_sync_options[] = {
1486 OPT__QUIET(&quiet, N_("suppress output of synchronizing submodule url")),
1487 OPT_BOOL(0, "recursive", &recursive,
1488 N_("recurse into nested submodules")),
1492 const char *const git_submodule_helper_usage[] = {
1493 N_("git submodule--helper sync [--quiet] [--recursive] [<path>]"),
1497 argc = parse_options(argc, argv, prefix, module_sync_options,
1498 git_submodule_helper_usage, 0);
1500 if (module_list_compute(argc, argv, prefix, &pathspec, &list) < 0)
1503 info.prefix = prefix;
1505 info.flags |= OPT_QUIET;
1507 info.flags |= OPT_RECURSIVE;
1509 for_each_listed_submodule(&list, sync_submodule_cb, &info);
1518 #define DEINIT_CB_INIT { NULL, 0 }
1520 static void deinit_submodule(const char *path, const char *prefix,
1523 const struct submodule *sub;
1524 char *displaypath = NULL;
1525 struct child_process cp_config = CHILD_PROCESS_INIT;
1526 struct strbuf sb_config = STRBUF_INIT;
1527 char *sub_git_dir = xstrfmt("%s/.git", path);
1529 sub = submodule_from_path(the_repository, null_oid(), path);
1531 if (!sub || !sub->name)
1534 displaypath = get_submodule_displaypath(path, prefix);
1536 /* remove the submodule work tree (unless the user already did it) */
1537 if (is_directory(path)) {
1538 struct strbuf sb_rm = STRBUF_INIT;
1542 * protect submodules containing a .git directory
1543 * NEEDSWORK: instead of dying, automatically call
1544 * absorbgitdirs and (possibly) warn.
1546 if (is_directory(sub_git_dir))
1547 die(_("Submodule work tree '%s' contains a .git "
1548 "directory (use 'rm -rf' if you really want "
1549 "to remove it including all of its history)"),
1552 if (!(flags & OPT_FORCE)) {
1553 struct child_process cp_rm = CHILD_PROCESS_INIT;
1555 strvec_pushl(&cp_rm.args, "rm", "-qn",
1558 if (run_command(&cp_rm))
1559 die(_("Submodule work tree '%s' contains local "
1560 "modifications; use '-f' to discard them"),
1564 strbuf_addstr(&sb_rm, path);
1566 if (!remove_dir_recursively(&sb_rm, 0))
1567 format = _("Cleared directory '%s'\n");
1569 format = _("Could not remove submodule work tree '%s'\n");
1571 if (!(flags & OPT_QUIET))
1572 printf(format, displaypath);
1574 submodule_unset_core_worktree(sub);
1576 strbuf_release(&sb_rm);
1579 if (mkdir(path, 0777))
1580 printf(_("could not create empty submodule directory %s"),
1583 cp_config.git_cmd = 1;
1584 strvec_pushl(&cp_config.args, "config", "--get-regexp", NULL);
1585 strvec_pushf(&cp_config.args, "submodule.%s\\.", sub->name);
1587 /* remove the .git/config entries (unless the user already did it) */
1588 if (!capture_command(&cp_config, &sb_config, 0) && sb_config.len) {
1589 char *sub_key = xstrfmt("submodule.%s", sub->name);
1591 * remove the whole section so we have a clean state when
1592 * the user later decides to init this submodule again
1594 git_config_rename_section_in_file(NULL, sub_key, NULL);
1595 if (!(flags & OPT_QUIET))
1596 printf(_("Submodule '%s' (%s) unregistered for path '%s'\n"),
1597 sub->name, sub->url, displaypath);
1604 strbuf_release(&sb_config);
1607 static void deinit_submodule_cb(const struct cache_entry *list_item,
1610 struct deinit_cb *info = cb_data;
1611 deinit_submodule(list_item->name, info->prefix, info->flags);
1614 static int module_deinit(int argc, const char **argv, const char *prefix)
1616 struct deinit_cb info = DEINIT_CB_INIT;
1617 struct pathspec pathspec;
1618 struct module_list list = MODULE_LIST_INIT;
1623 struct option module_deinit_options[] = {
1624 OPT__QUIET(&quiet, N_("suppress submodule status output")),
1625 OPT__FORCE(&force, N_("remove submodule working trees even if they contain local changes"), 0),
1626 OPT_BOOL(0, "all", &all, N_("unregister all submodules")),
1630 const char *const git_submodule_helper_usage[] = {
1631 N_("git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"),
1635 argc = parse_options(argc, argv, prefix, module_deinit_options,
1636 git_submodule_helper_usage, 0);
1639 error("pathspec and --all are incompatible");
1640 usage_with_options(git_submodule_helper_usage,
1641 module_deinit_options);
1645 die(_("Use '--all' if you really want to deinitialize all submodules"));
1647 if (module_list_compute(argc, argv, prefix, &pathspec, &list) < 0)
1650 info.prefix = prefix;
1652 info.flags |= OPT_QUIET;
1654 info.flags |= OPT_FORCE;
1656 for_each_listed_submodule(&list, deinit_submodule_cb, &info);
1661 static int clone_submodule(const char *path, const char *gitdir, const char *url,
1662 const char *depth, struct string_list *reference, int dissociate,
1663 int quiet, int progress, int single_branch)
1665 struct child_process cp = CHILD_PROCESS_INIT;
1667 strvec_push(&cp.args, "clone");
1668 strvec_push(&cp.args, "--no-checkout");
1670 strvec_push(&cp.args, "--quiet");
1672 strvec_push(&cp.args, "--progress");
1673 if (depth && *depth)
1674 strvec_pushl(&cp.args, "--depth", depth, NULL);
1675 if (reference->nr) {
1676 struct string_list_item *item;
1677 for_each_string_list_item(item, reference)
1678 strvec_pushl(&cp.args, "--reference",
1679 item->string, NULL);
1682 strvec_push(&cp.args, "--dissociate");
1683 if (gitdir && *gitdir)
1684 strvec_pushl(&cp.args, "--separate-git-dir", gitdir, NULL);
1685 if (single_branch >= 0)
1686 strvec_push(&cp.args, single_branch ?
1688 "--no-single-branch");
1690 strvec_push(&cp.args, "--");
1691 strvec_push(&cp.args, url);
1692 strvec_push(&cp.args, path);
1695 prepare_submodule_repo_env(&cp.env_array);
1698 return run_command(&cp);
1701 struct submodule_alternate_setup {
1702 const char *submodule_name;
1703 enum SUBMODULE_ALTERNATE_ERROR_MODE {
1704 SUBMODULE_ALTERNATE_ERROR_DIE,
1705 SUBMODULE_ALTERNATE_ERROR_INFO,
1706 SUBMODULE_ALTERNATE_ERROR_IGNORE
1708 struct string_list *reference;
1710 #define SUBMODULE_ALTERNATE_SETUP_INIT { NULL, \
1711 SUBMODULE_ALTERNATE_ERROR_IGNORE, NULL }
1713 static const char alternate_error_advice[] = N_(
1714 "An alternate computed from a superproject's alternate is invalid.\n"
1715 "To allow Git to clone without an alternate in such a case, set\n"
1716 "submodule.alternateErrorStrategy to 'info' or, equivalently, clone with\n"
1717 "'--reference-if-able' instead of '--reference'."
1720 static int add_possible_reference_from_superproject(
1721 struct object_directory *odb, void *sas_cb)
1723 struct submodule_alternate_setup *sas = sas_cb;
1727 * If the alternate object store is another repository, try the
1728 * standard layout with .git/(modules/<name>)+/objects
1730 if (strip_suffix(odb->path, "/objects", &len)) {
1732 struct strbuf sb = STRBUF_INIT;
1733 struct strbuf err = STRBUF_INIT;
1734 strbuf_add(&sb, odb->path, len);
1737 * We need to end the new path with '/' to mark it as a dir,
1738 * otherwise a submodule name containing '/' will be broken
1739 * as the last part of a missing submodule reference would
1740 * be taken as a file name.
1742 strbuf_addf(&sb, "/modules/%s/", sas->submodule_name);
1744 sm_alternate = compute_alternate_path(sb.buf, &err);
1746 string_list_append(sas->reference, xstrdup(sb.buf));
1749 switch (sas->error_mode) {
1750 case SUBMODULE_ALTERNATE_ERROR_DIE:
1751 if (advice_submodule_alternate_error_strategy_die)
1752 advise(_(alternate_error_advice));
1753 die(_("submodule '%s' cannot add alternate: %s"),
1754 sas->submodule_name, err.buf);
1755 case SUBMODULE_ALTERNATE_ERROR_INFO:
1756 fprintf_ln(stderr, _("submodule '%s' cannot add alternate: %s"),
1757 sas->submodule_name, err.buf);
1758 case SUBMODULE_ALTERNATE_ERROR_IGNORE:
1762 strbuf_release(&sb);
1768 static void prepare_possible_alternates(const char *sm_name,
1769 struct string_list *reference)
1771 char *sm_alternate = NULL, *error_strategy = NULL;
1772 struct submodule_alternate_setup sas = SUBMODULE_ALTERNATE_SETUP_INIT;
1774 git_config_get_string("submodule.alternateLocation", &sm_alternate);
1778 git_config_get_string("submodule.alternateErrorStrategy", &error_strategy);
1780 if (!error_strategy)
1781 error_strategy = xstrdup("die");
1783 sas.submodule_name = sm_name;
1784 sas.reference = reference;
1785 if (!strcmp(error_strategy, "die"))
1786 sas.error_mode = SUBMODULE_ALTERNATE_ERROR_DIE;
1787 else if (!strcmp(error_strategy, "info"))
1788 sas.error_mode = SUBMODULE_ALTERNATE_ERROR_INFO;
1789 else if (!strcmp(error_strategy, "ignore"))
1790 sas.error_mode = SUBMODULE_ALTERNATE_ERROR_IGNORE;
1792 die(_("Value '%s' for submodule.alternateErrorStrategy is not recognized"), error_strategy);
1794 if (!strcmp(sm_alternate, "superproject"))
1795 foreach_alt_odb(add_possible_reference_from_superproject, &sas);
1796 else if (!strcmp(sm_alternate, "no"))
1799 die(_("Value '%s' for submodule.alternateLocation is not recognized"), sm_alternate);
1802 free(error_strategy);
1805 static int module_clone(int argc, const char **argv, const char *prefix)
1807 const char *name = NULL, *url = NULL, *depth = NULL;
1810 char *p, *path = NULL, *sm_gitdir;
1811 struct strbuf sb = STRBUF_INIT;
1812 struct string_list reference = STRING_LIST_INIT_NODUP;
1813 int dissociate = 0, require_init = 0;
1814 char *sm_alternate = NULL, *error_strategy = NULL;
1815 int single_branch = -1;
1817 struct option module_clone_options[] = {
1818 OPT_STRING(0, "prefix", &prefix,
1820 N_("alternative anchor for relative paths")),
1821 OPT_STRING(0, "path", &path,
1823 N_("where the new submodule will be cloned to")),
1824 OPT_STRING(0, "name", &name,
1826 N_("name of the new submodule")),
1827 OPT_STRING(0, "url", &url,
1829 N_("url where to clone the submodule from")),
1830 OPT_STRING_LIST(0, "reference", &reference,
1832 N_("reference repository")),
1833 OPT_BOOL(0, "dissociate", &dissociate,
1834 N_("use --reference only while cloning")),
1835 OPT_STRING(0, "depth", &depth,
1837 N_("depth for shallow clones")),
1838 OPT__QUIET(&quiet, "Suppress output for cloning a submodule"),
1839 OPT_BOOL(0, "progress", &progress,
1840 N_("force cloning progress")),
1841 OPT_BOOL(0, "require-init", &require_init,
1842 N_("disallow cloning into non-empty directory")),
1843 OPT_BOOL(0, "single-branch", &single_branch,
1844 N_("clone only one branch, HEAD or --branch")),
1848 const char *const git_submodule_helper_usage[] = {
1849 N_("git submodule--helper clone [--prefix=<path>] [--quiet] "
1850 "[--reference <repository>] [--name <name>] [--depth <depth>] "
1851 "[--single-branch] "
1852 "--url <url> --path <path>"),
1856 argc = parse_options(argc, argv, prefix, module_clone_options,
1857 git_submodule_helper_usage, 0);
1859 if (argc || !url || !path || !*path)
1860 usage_with_options(git_submodule_helper_usage,
1861 module_clone_options);
1863 strbuf_addf(&sb, "%s/modules/%s", get_git_dir(), name);
1864 sm_gitdir = absolute_pathdup(sb.buf);
1867 if (!is_absolute_path(path)) {
1868 strbuf_addf(&sb, "%s/%s", get_git_work_tree(), path);
1869 path = strbuf_detach(&sb, NULL);
1871 path = xstrdup(path);
1873 if (validate_submodule_git_dir(sm_gitdir, name) < 0)
1874 die(_("refusing to create/use '%s' in another submodule's "
1875 "git dir"), sm_gitdir);
1877 if (!file_exists(sm_gitdir)) {
1878 if (safe_create_leading_directories_const(sm_gitdir) < 0)
1879 die(_("could not create directory '%s'"), sm_gitdir);
1881 prepare_possible_alternates(name, &reference);
1883 if (clone_submodule(path, sm_gitdir, url, depth, &reference, dissociate,
1884 quiet, progress, single_branch))
1885 die(_("clone of '%s' into submodule path '%s' failed"),
1888 if (require_init && !access(path, X_OK) && !is_empty_dir(path))
1889 die(_("directory not empty: '%s'"), path);
1890 if (safe_create_leading_directories_const(path) < 0)
1891 die(_("could not create directory '%s'"), path);
1892 strbuf_addf(&sb, "%s/index", sm_gitdir);
1893 unlink_or_warn(sb.buf);
1897 connect_work_tree_and_git_dir(path, sm_gitdir, 0);
1899 p = git_pathdup_submodule(path, "config");
1901 die(_("could not get submodule directory for '%s'"), path);
1903 /* setup alternateLocation and alternateErrorStrategy in the cloned submodule if needed */
1904 git_config_get_string("submodule.alternateLocation", &sm_alternate);
1906 git_config_set_in_file(p, "submodule.alternateLocation",
1908 git_config_get_string("submodule.alternateErrorStrategy", &error_strategy);
1910 git_config_set_in_file(p, "submodule.alternateErrorStrategy",
1914 free(error_strategy);
1916 strbuf_release(&sb);
1923 static void determine_submodule_update_strategy(struct repository *r,
1927 struct submodule_update_strategy *out)
1929 const struct submodule *sub = submodule_from_path(r, null_oid(), path);
1933 key = xstrfmt("submodule.%s.update", sub->name);
1936 if (parse_submodule_update_strategy(update, out) < 0)
1937 die(_("Invalid update mode '%s' for submodule path '%s'"),
1939 } else if (!repo_config_get_string_tmp(r, key, &val)) {
1940 if (parse_submodule_update_strategy(val, out) < 0)
1941 die(_("Invalid update mode '%s' configured for submodule path '%s'"),
1943 } else if (sub->update_strategy.type != SM_UPDATE_UNSPECIFIED) {
1944 if (sub->update_strategy.type == SM_UPDATE_COMMAND)
1945 BUG("how did we read update = !command from .gitmodules?");
1946 out->type = sub->update_strategy.type;
1947 out->command = sub->update_strategy.command;
1949 out->type = SM_UPDATE_CHECKOUT;
1952 (out->type == SM_UPDATE_MERGE ||
1953 out->type == SM_UPDATE_REBASE ||
1954 out->type == SM_UPDATE_NONE))
1955 out->type = SM_UPDATE_CHECKOUT;
1960 static int module_update_module_mode(int argc, const char **argv, const char *prefix)
1962 const char *path, *update = NULL;
1964 struct submodule_update_strategy update_strategy = { .type = SM_UPDATE_CHECKOUT };
1966 if (argc < 3 || argc > 4)
1967 die("submodule--helper update-module-clone expects <just-cloned> <path> [<update>]");
1969 just_cloned = git_config_int("just_cloned", argv[1]);
1975 determine_submodule_update_strategy(the_repository,
1976 just_cloned, path, update,
1978 fputs(submodule_strategy_to_string(&update_strategy), stdout);
1983 struct update_clone_data {
1984 const struct submodule *sub;
1985 struct object_id oid;
1986 unsigned just_cloned;
1989 struct submodule_update_clone {
1990 /* index into 'list', the list of submodules to look into for cloning */
1992 struct module_list list;
1993 unsigned warn_if_uninitialized : 1;
1995 /* update parameter passed via commandline */
1996 struct submodule_update_strategy update;
1998 /* configuration parameters which are passed on to the children */
2001 int recommend_shallow;
2002 struct string_list references;
2004 unsigned require_init;
2006 const char *recursive_prefix;
2010 /* to be consumed by git-submodule.sh */
2011 struct update_clone_data *update_clone;
2012 int update_clone_nr; int update_clone_alloc;
2014 /* If we want to stop as fast as possible and return an error */
2015 unsigned quickstop : 1;
2017 /* failed clones to be retried again */
2018 const struct cache_entry **failed_clones;
2019 int failed_clones_nr, failed_clones_alloc;
2023 #define SUBMODULE_UPDATE_CLONE_INIT { \
2024 .list = MODULE_LIST_INIT, \
2025 .update = SUBMODULE_UPDATE_STRATEGY_INIT, \
2026 .recommend_shallow = -1, \
2027 .references = STRING_LIST_INIT_DUP, \
2028 .single_branch = -1, \
2033 static void next_submodule_warn_missing(struct submodule_update_clone *suc,
2034 struct strbuf *out, const char *displaypath)
2037 * Only mention uninitialized submodules when their
2038 * paths have been specified.
2040 if (suc->warn_if_uninitialized) {
2042 _("Submodule path '%s' not initialized"),
2044 strbuf_addch(out, '\n');
2046 _("Maybe you want to use 'update --init'?"));
2047 strbuf_addch(out, '\n');
2052 * Determine whether 'ce' needs to be cloned. If so, prepare the 'child' to
2053 * run the clone. Returns 1 if 'ce' needs to be cloned, 0 otherwise.
2055 static int prepare_to_clone_next_submodule(const struct cache_entry *ce,
2056 struct child_process *child,
2057 struct submodule_update_clone *suc,
2060 const struct submodule *sub = NULL;
2061 const char *url = NULL;
2062 const char *update_string;
2063 enum submodule_update_type update_type;
2065 struct strbuf displaypath_sb = STRBUF_INIT;
2066 struct strbuf sb = STRBUF_INIT;
2067 const char *displaypath = NULL;
2068 int needs_cloning = 0;
2069 int need_free_url = 0;
2072 if (suc->recursive_prefix)
2073 strbuf_addf(&sb, "%s/%s", suc->recursive_prefix, ce->name);
2075 strbuf_addstr(&sb, ce->name);
2076 strbuf_addf(out, _("Skipping unmerged submodule %s"), sb.buf);
2077 strbuf_addch(out, '\n');
2081 sub = submodule_from_path(the_repository, null_oid(), ce->name);
2083 if (suc->recursive_prefix)
2084 displaypath = relative_path(suc->recursive_prefix,
2085 ce->name, &displaypath_sb);
2087 displaypath = ce->name;
2090 next_submodule_warn_missing(suc, out, displaypath);
2094 key = xstrfmt("submodule.%s.update", sub->name);
2095 if (!repo_config_get_string_tmp(the_repository, key, &update_string)) {
2096 update_type = parse_submodule_update_type(update_string);
2098 update_type = sub->update_strategy.type;
2102 if (suc->update.type == SM_UPDATE_NONE
2103 || (suc->update.type == SM_UPDATE_UNSPECIFIED
2104 && update_type == SM_UPDATE_NONE)) {
2105 strbuf_addf(out, _("Skipping submodule '%s'"), displaypath);
2106 strbuf_addch(out, '\n');
2110 /* Check if the submodule has been initialized. */
2111 if (!is_submodule_active(the_repository, ce->name)) {
2112 next_submodule_warn_missing(suc, out, displaypath);
2117 strbuf_addf(&sb, "submodule.%s.url", sub->name);
2118 if (repo_config_get_string_tmp(the_repository, sb.buf, &url)) {
2119 if (starts_with_dot_slash(sub->url) ||
2120 starts_with_dot_dot_slash(sub->url)) {
2121 url = compute_submodule_clone_url(sub->url);
2128 strbuf_addf(&sb, "%s/.git", ce->name);
2129 needs_cloning = !file_exists(sb.buf);
2131 ALLOC_GROW(suc->update_clone, suc->update_clone_nr + 1,
2132 suc->update_clone_alloc);
2133 oidcpy(&suc->update_clone[suc->update_clone_nr].oid, &ce->oid);
2134 suc->update_clone[suc->update_clone_nr].just_cloned = needs_cloning;
2135 suc->update_clone[suc->update_clone_nr].sub = sub;
2136 suc->update_clone_nr++;
2142 child->no_stdin = 1;
2143 child->stdout_to_stderr = 1;
2145 strvec_push(&child->args, "submodule--helper");
2146 strvec_push(&child->args, "clone");
2148 strvec_push(&child->args, "--progress");
2150 strvec_push(&child->args, "--quiet");
2152 strvec_pushl(&child->args, "--prefix", suc->prefix, NULL);
2153 if (suc->recommend_shallow && sub->recommend_shallow == 1)
2154 strvec_push(&child->args, "--depth=1");
2155 if (suc->require_init)
2156 strvec_push(&child->args, "--require-init");
2157 strvec_pushl(&child->args, "--path", sub->path, NULL);
2158 strvec_pushl(&child->args, "--name", sub->name, NULL);
2159 strvec_pushl(&child->args, "--url", url, NULL);
2160 if (suc->references.nr) {
2161 struct string_list_item *item;
2162 for_each_string_list_item(item, &suc->references)
2163 strvec_pushl(&child->args, "--reference", item->string, NULL);
2165 if (suc->dissociate)
2166 strvec_push(&child->args, "--dissociate");
2168 strvec_push(&child->args, suc->depth);
2169 if (suc->single_branch >= 0)
2170 strvec_push(&child->args, suc->single_branch ?
2172 "--no-single-branch");
2175 strbuf_release(&displaypath_sb);
2176 strbuf_release(&sb);
2180 return needs_cloning;
2183 static int update_clone_get_next_task(struct child_process *child,
2188 struct submodule_update_clone *suc = suc_cb;
2189 const struct cache_entry *ce;
2192 for (; suc->current < suc->list.nr; suc->current++) {
2193 ce = suc->list.entries[suc->current];
2194 if (prepare_to_clone_next_submodule(ce, child, suc, err)) {
2195 int *p = xmalloc(sizeof(*p));
2204 * The loop above tried cloning each submodule once, now try the
2205 * stragglers again, which we can imagine as an extension of the
2208 index = suc->current - suc->list.nr;
2209 if (index < suc->failed_clones_nr) {
2211 ce = suc->failed_clones[index];
2212 if (!prepare_to_clone_next_submodule(ce, child, suc, err)) {
2214 strbuf_addstr(err, "BUG: submodule considered for "
2215 "cloning, doesn't need cloning "
2219 p = xmalloc(sizeof(*p));
2229 static int update_clone_start_failure(struct strbuf *err,
2233 struct submodule_update_clone *suc = suc_cb;
2238 static int update_clone_task_finished(int result,
2243 const struct cache_entry *ce;
2244 struct submodule_update_clone *suc = suc_cb;
2246 int *idxP = idx_task_cb;
2253 if (idx < suc->list.nr) {
2254 ce = suc->list.entries[idx];
2255 strbuf_addf(err, _("Failed to clone '%s'. Retry scheduled"),
2257 strbuf_addch(err, '\n');
2258 ALLOC_GROW(suc->failed_clones,
2259 suc->failed_clones_nr + 1,
2260 suc->failed_clones_alloc);
2261 suc->failed_clones[suc->failed_clones_nr++] = ce;
2264 idx -= suc->list.nr;
2265 ce = suc->failed_clones[idx];
2266 strbuf_addf(err, _("Failed to clone '%s' a second time, aborting"),
2268 strbuf_addch(err, '\n');
2276 static int git_update_clone_config(const char *var, const char *value,
2280 if (!strcmp(var, "submodule.fetchjobs"))
2281 *max_jobs = parse_submodule_fetchjobs(var, value);
2285 static void update_submodule(struct update_clone_data *ucd)
2287 fprintf(stdout, "dummy %s %d\t%s\n",
2288 oid_to_hex(&ucd->oid),
2293 static int update_submodules(struct submodule_update_clone *suc)
2297 run_processes_parallel_tr2(suc->max_jobs, update_clone_get_next_task,
2298 update_clone_start_failure,
2299 update_clone_task_finished, suc, "submodule",
2303 * We saved the output and put it out all at once now.
2305 * - the listener does not have to interleave their (checkout)
2306 * work with our fetching. The writes involved in a
2307 * checkout involve more straightforward sequential I/O.
2308 * - the listener can avoid doing any work if fetching failed.
2313 for (i = 0; i < suc->update_clone_nr; i++)
2314 update_submodule(&suc->update_clone[i]);
2319 static int update_clone(int argc, const char **argv, const char *prefix)
2321 const char *update = NULL;
2322 struct pathspec pathspec;
2323 struct submodule_update_clone suc = SUBMODULE_UPDATE_CLONE_INIT;
2325 struct option module_update_clone_options[] = {
2326 OPT_STRING(0, "prefix", &prefix,
2328 N_("path into the working tree")),
2329 OPT_STRING(0, "recursive-prefix", &suc.recursive_prefix,
2331 N_("path into the working tree, across nested "
2332 "submodule boundaries")),
2333 OPT_STRING(0, "update", &update,
2335 N_("rebase, merge, checkout or none")),
2336 OPT_STRING_LIST(0, "reference", &suc.references, N_("repo"),
2337 N_("reference repository")),
2338 OPT_BOOL(0, "dissociate", &suc.dissociate,
2339 N_("use --reference only while cloning")),
2340 OPT_STRING(0, "depth", &suc.depth, "<depth>",
2341 N_("create a shallow clone truncated to the "
2342 "specified number of revisions")),
2343 OPT_INTEGER('j', "jobs", &suc.max_jobs,
2344 N_("parallel jobs")),
2345 OPT_BOOL(0, "recommend-shallow", &suc.recommend_shallow,
2346 N_("whether the initial clone should follow the shallow recommendation")),
2347 OPT__QUIET(&suc.quiet, N_("don't print cloning progress")),
2348 OPT_BOOL(0, "progress", &suc.progress,
2349 N_("force cloning progress")),
2350 OPT_BOOL(0, "require-init", &suc.require_init,
2351 N_("disallow cloning into non-empty directory")),
2352 OPT_BOOL(0, "single-branch", &suc.single_branch,
2353 N_("clone only one branch, HEAD or --branch")),
2357 const char *const git_submodule_helper_usage[] = {
2358 N_("git submodule--helper update-clone [--prefix=<path>] [<path>...]"),
2361 suc.prefix = prefix;
2363 update_clone_config_from_gitmodules(&suc.max_jobs);
2364 git_config(git_update_clone_config, &suc.max_jobs);
2366 argc = parse_options(argc, argv, prefix, module_update_clone_options,
2367 git_submodule_helper_usage, 0);
2370 if (parse_submodule_update_strategy(update, &suc.update) < 0)
2371 die(_("bad value for update parameter"));
2373 if (module_list_compute(argc, argv, prefix, &pathspec, &suc.list) < 0)
2377 suc.warn_if_uninitialized = 1;
2379 return update_submodules(&suc);
2382 static int resolve_relative_path(int argc, const char **argv, const char *prefix)
2384 struct strbuf sb = STRBUF_INIT;
2386 die("submodule--helper relative-path takes exactly 2 arguments, got %d", argc);
2388 printf("%s", relative_path(argv[1], argv[2], &sb));
2389 strbuf_release(&sb);
2393 static const char *remote_submodule_branch(const char *path)
2395 const struct submodule *sub;
2396 const char *branch = NULL;
2399 sub = submodule_from_path(the_repository, null_oid(), path);
2403 key = xstrfmt("submodule.%s.branch", sub->name);
2404 if (repo_config_get_string_tmp(the_repository, key, &branch))
2405 branch = sub->branch;
2411 if (!strcmp(branch, ".")) {
2412 const char *refname = resolve_ref_unsafe("HEAD", 0, NULL, NULL);
2415 die(_("No such ref: %s"), "HEAD");
2418 if (!strcmp(refname, "HEAD"))
2419 die(_("Submodule (%s) branch configured to inherit "
2420 "branch from superproject, but the superproject "
2421 "is not on any branch"), sub->name);
2423 if (!skip_prefix(refname, "refs/heads/", &refname))
2424 die(_("Expecting a full ref name, got %s"), refname);
2431 static int resolve_remote_submodule_branch(int argc, const char **argv,
2435 struct strbuf sb = STRBUF_INIT;
2437 die("submodule--helper remote-branch takes exactly one arguments, got %d", argc);
2439 ret = remote_submodule_branch(argv[1]);
2441 die("submodule %s doesn't exist", argv[1]);
2444 strbuf_release(&sb);
2448 static int push_check(int argc, const char **argv, const char *prefix)
2450 struct remote *remote;
2451 const char *superproject_head;
2453 int detached_head = 0;
2454 struct object_id head_oid;
2457 die("submodule--helper push-check requires at least 2 arguments");
2460 * superproject's resolved head ref.
2461 * if HEAD then the superproject is in a detached head state, otherwise
2462 * it will be the resolved head ref.
2464 superproject_head = argv[1];
2467 /* Get the submodule's head ref and determine if it is detached */
2468 head = resolve_refdup("HEAD", 0, &head_oid, NULL);
2470 die(_("Failed to resolve HEAD as a valid ref."));
2471 if (!strcmp(head, "HEAD"))
2475 * The remote must be configured.
2476 * This is to avoid pushing to the exact same URL as the parent.
2478 remote = pushremote_get(argv[1]);
2479 if (!remote || remote->origin == REMOTE_UNCONFIGURED)
2480 die("remote '%s' not configured", argv[1]);
2482 /* Check the refspec */
2485 struct ref *local_refs = get_local_heads();
2486 struct refspec refspec = REFSPEC_INIT_PUSH;
2488 refspec_appendn(&refspec, argv + 2, argc - 2);
2490 for (i = 0; i < refspec.nr; i++) {
2491 const struct refspec_item *rs = &refspec.items[i];
2493 if (rs->pattern || rs->matching)
2496 /* LHS must match a single ref */
2497 switch (count_refspec_match(rs->src, local_refs, NULL)) {
2502 * If LHS matches 'HEAD' then we need to ensure
2503 * that it matches the same named branch
2504 * checked out in the superproject.
2506 if (!strcmp(rs->src, "HEAD")) {
2507 if (!detached_head &&
2508 !strcmp(head, superproject_head))
2510 die("HEAD does not match the named branch in the superproject");
2514 die("src refspec '%s' must name a ref",
2518 refspec_clear(&refspec);
2525 static int ensure_core_worktree(int argc, const char **argv, const char *prefix)
2527 const struct submodule *sub;
2530 struct repository subrepo;
2533 BUG("submodule--helper ensure-core-worktree <path>");
2537 sub = submodule_from_path(the_repository, null_oid(), path);
2539 BUG("We could get the submodule handle before?");
2541 if (repo_submodule_init(&subrepo, the_repository, sub))
2542 die(_("could not get a repository handle for submodule '%s'"), path);
2544 if (!repo_config_get_string_tmp(&subrepo, "core.worktree", &cw)) {
2545 char *cfg_file, *abs_path;
2546 const char *rel_path;
2547 struct strbuf sb = STRBUF_INIT;
2549 cfg_file = repo_git_path(&subrepo, "config");
2551 abs_path = absolute_pathdup(path);
2552 rel_path = relative_path(abs_path, subrepo.gitdir, &sb);
2554 git_config_set_in_file(cfg_file, "core.worktree", rel_path);
2558 strbuf_release(&sb);
2564 static int absorb_git_dirs(int argc, const char **argv, const char *prefix)
2567 struct pathspec pathspec;
2568 struct module_list list = MODULE_LIST_INIT;
2569 unsigned flags = ABSORB_GITDIR_RECURSE_SUBMODULES;
2571 struct option embed_gitdir_options[] = {
2572 OPT_STRING(0, "prefix", &prefix,
2574 N_("path into the working tree")),
2575 OPT_BIT(0, "--recursive", &flags, N_("recurse into submodules"),
2576 ABSORB_GITDIR_RECURSE_SUBMODULES),
2580 const char *const git_submodule_helper_usage[] = {
2581 N_("git submodule--helper absorb-git-dirs [<options>] [<path>...]"),
2585 argc = parse_options(argc, argv, prefix, embed_gitdir_options,
2586 git_submodule_helper_usage, 0);
2588 if (module_list_compute(argc, argv, prefix, &pathspec, &list) < 0)
2591 for (i = 0; i < list.nr; i++)
2592 absorb_git_dir_into_superproject(list.entries[i]->name, flags);
2597 static int is_active(int argc, const char **argv, const char *prefix)
2600 die("submodule--helper is-active takes exactly 1 argument");
2602 return !is_submodule_active(the_repository, argv[1]);
2606 * Exit non-zero if any of the submodule names given on the command line is
2607 * invalid. If no names are given, filter stdin to print only valid names
2608 * (which is primarily intended for testing).
2610 static int check_name(int argc, const char **argv, const char *prefix)
2614 if (check_submodule_name(*argv) < 0)
2618 struct strbuf buf = STRBUF_INIT;
2619 while (strbuf_getline(&buf, stdin) != EOF) {
2620 if (!check_submodule_name(buf.buf))
2621 printf("%s\n", buf.buf);
2623 strbuf_release(&buf);
2628 static int module_config(int argc, const char **argv, const char *prefix)
2631 CHECK_WRITEABLE = 1,
2635 struct option module_config_options[] = {
2636 OPT_CMDMODE(0, "check-writeable", &command,
2637 N_("check if it is safe to write to the .gitmodules file"),
2639 OPT_CMDMODE(0, "unset", &command,
2640 N_("unset the config in the .gitmodules file"),
2644 const char *const git_submodule_helper_usage[] = {
2645 N_("git submodule--helper config <name> [<value>]"),
2646 N_("git submodule--helper config --unset <name>"),
2647 N_("git submodule--helper config --check-writeable"),
2651 argc = parse_options(argc, argv, prefix, module_config_options,
2652 git_submodule_helper_usage, PARSE_OPT_KEEP_ARGV0);
2654 if (argc == 1 && command == CHECK_WRITEABLE)
2655 return is_writing_gitmodules_ok() ? 0 : -1;
2657 /* Equivalent to ACTION_GET in builtin/config.c */
2658 if (argc == 2 && command != DO_UNSET)
2659 return print_config_from_gitmodules(the_repository, argv[1]);
2661 /* Equivalent to ACTION_SET in builtin/config.c */
2662 if (argc == 3 || (argc == 2 && command == DO_UNSET)) {
2663 const char *value = (argc == 3) ? argv[2] : NULL;
2665 if (!is_writing_gitmodules_ok())
2666 die(_("please make sure that the .gitmodules file is in the working tree"));
2668 return config_set_in_gitmodules_file_gently(argv[1], value);
2671 usage_with_options(git_submodule_helper_usage, module_config_options);
2674 static int module_set_url(int argc, const char **argv, const char *prefix)
2681 struct option options[] = {
2682 OPT__QUIET(&quiet, N_("suppress output for setting url of a submodule")),
2685 const char *const usage[] = {
2686 N_("git submodule--helper set-url [--quiet] <path> <newurl>"),
2690 argc = parse_options(argc, argv, prefix, options, usage, 0);
2692 if (argc != 2 || !(path = argv[0]) || !(newurl = argv[1]))
2693 usage_with_options(usage, options);
2695 config_name = xstrfmt("submodule.%s.url", path);
2697 config_set_in_gitmodules_file_gently(config_name, newurl);
2698 sync_submodule(path, prefix, quiet ? OPT_QUIET : 0);
2705 static int module_set_branch(int argc, const char **argv, const char *prefix)
2707 int opt_default = 0, ret;
2708 const char *opt_branch = NULL;
2713 * We accept the `quiet` option for uniformity across subcommands,
2714 * though there is nothing to make less verbose in this subcommand.
2716 struct option options[] = {
2717 OPT_NOOP_NOARG('q', "quiet"),
2718 OPT_BOOL('d', "default", &opt_default,
2719 N_("set the default tracking branch to master")),
2720 OPT_STRING('b', "branch", &opt_branch, N_("branch"),
2721 N_("set the default tracking branch")),
2724 const char *const usage[] = {
2725 N_("git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"),
2726 N_("git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"),
2730 argc = parse_options(argc, argv, prefix, options, usage, 0);
2732 if (!opt_branch && !opt_default)
2733 die(_("--branch or --default required"));
2735 if (opt_branch && opt_default)
2736 die(_("--branch and --default are mutually exclusive"));
2738 if (argc != 1 || !(path = argv[0]))
2739 usage_with_options(usage, options);
2741 config_name = xstrfmt("submodule.%s.branch", path);
2742 ret = config_set_in_gitmodules_file_gently(config_name, opt_branch);
2748 #define SUPPORT_SUPER_PREFIX (1<<0)
2752 int (*fn)(int, const char **, const char *);
2756 static struct cmd_struct commands[] = {
2757 {"list", module_list, 0},
2758 {"name", module_name, 0},
2759 {"clone", module_clone, 0},
2760 {"update-module-mode", module_update_module_mode, 0},
2761 {"update-clone", update_clone, 0},
2762 {"ensure-core-worktree", ensure_core_worktree, 0},
2763 {"relative-path", resolve_relative_path, 0},
2764 {"resolve-relative-url", resolve_relative_url, 0},
2765 {"resolve-relative-url-test", resolve_relative_url_test, 0},
2766 {"foreach", module_foreach, SUPPORT_SUPER_PREFIX},
2767 {"init", module_init, SUPPORT_SUPER_PREFIX},
2768 {"status", module_status, SUPPORT_SUPER_PREFIX},
2769 {"print-default-remote", print_default_remote, 0},
2770 {"sync", module_sync, SUPPORT_SUPER_PREFIX},
2771 {"deinit", module_deinit, 0},
2772 {"summary", module_summary, SUPPORT_SUPER_PREFIX},
2773 {"remote-branch", resolve_remote_submodule_branch, 0},
2774 {"push-check", push_check, 0},
2775 {"absorb-git-dirs", absorb_git_dirs, SUPPORT_SUPER_PREFIX},
2776 {"is-active", is_active, 0},
2777 {"check-name", check_name, 0},
2778 {"config", module_config, 0},
2779 {"set-url", module_set_url, 0},
2780 {"set-branch", module_set_branch, 0},
2783 int cmd_submodule__helper(int argc, const char **argv, const char *prefix)
2786 if (argc < 2 || !strcmp(argv[1], "-h"))
2787 usage("git submodule--helper <command>");
2789 for (i = 0; i < ARRAY_SIZE(commands); i++) {
2790 if (!strcmp(argv[1], commands[i].cmd)) {
2791 if (get_super_prefix() &&
2792 !(commands[i].option & SUPPORT_SUPER_PREFIX))
2793 die(_("%s doesn't support --super-prefix"),
2795 return commands[i].fn(argc - 1, argv + 1, prefix);
2799 die(_("'%s' is not a valid submodule--helper "
2800 "subcommand"), argv[1]);