2 #include "repository.h"
5 #include "parse-options.h"
10 #include "submodule-config.h"
11 #include "string-list.h"
12 #include "run-command.h"
20 #define OPT_QUIET (1 << 0)
21 #define OPT_CACHED (1 << 1)
22 #define OPT_RECURSIVE (1 << 2)
23 #define OPT_FORCE (1 << 3)
25 typedef void (*each_submodule_fn
)(const struct cache_entry
*list_item
,
28 static char *get_default_remote(void)
30 char *dest
= NULL
, *ret
;
31 struct strbuf sb
= STRBUF_INIT
;
32 const char *refname
= resolve_ref_unsafe("HEAD", 0, NULL
, NULL
);
35 die(_("No such ref: %s"), "HEAD");
38 if (!strcmp(refname
, "HEAD"))
39 return xstrdup("origin");
41 if (!skip_prefix(refname
, "refs/heads/", &refname
))
42 die(_("Expecting a full ref name, got %s"), refname
);
44 strbuf_addf(&sb
, "branch.%s.remote", refname
);
45 if (git_config_get_string(sb
.buf
, &dest
))
46 ret
= xstrdup("origin");
54 static int print_default_remote(int argc
, const char **argv
, const char *prefix
)
59 die(_("submodule--helper print-default-remote takes no arguments"));
61 remote
= get_default_remote();
63 printf("%s\n", remote
);
68 static int starts_with_dot_slash(const char *str
)
70 return str
[0] == '.' && is_dir_sep(str
[1]);
73 static int starts_with_dot_dot_slash(const char *str
)
75 return str
[0] == '.' && str
[1] == '.' && is_dir_sep(str
[2]);
79 * Returns 1 if it was the last chop before ':'.
81 static int chop_last_dir(char **remoteurl
, int is_relative
)
83 char *rfind
= find_last_dir_sep(*remoteurl
);
89 rfind
= strrchr(*remoteurl
, ':');
95 if (is_relative
|| !strcmp(".", *remoteurl
))
96 die(_("cannot strip one component off url '%s'"),
100 *remoteurl
= xstrdup(".");
105 * The `url` argument is the URL that navigates to the submodule origin
106 * repo. When relative, this URL is relative to the superproject origin
107 * URL repo. The `up_path` argument, if specified, is the relative
108 * path that navigates from the submodule working tree to the superproject
109 * working tree. Returns the origin URL of the submodule.
111 * Return either an absolute URL or filesystem path (if the superproject
112 * origin URL is an absolute URL or filesystem path, respectively) or a
113 * relative file system path (if the superproject origin URL is a relative
116 * When the output is a relative file system path, the path is either
117 * relative to the submodule working tree, if up_path is specified, or to
118 * the superproject working tree otherwise.
120 * NEEDSWORK: This works incorrectly on the domain and protocol part.
121 * remote_url url outcome expectation
122 * http://a.com/b ../c http://a.com/c as is
123 * http://a.com/b/ ../c http://a.com/c same as previous line, but
124 * ignore trailing slash in url
125 * http://a.com/b ../../c http://c error out
126 * http://a.com/b ../../../c http:/c error out
127 * http://a.com/b ../../../../c http:c error out
128 * http://a.com/b ../../../../../c .:c error out
129 * NEEDSWORK: Given how chop_last_dir() works, this function is broken
130 * when a local part has a colon in its path component, too.
132 static char *relative_url(const char *remote_url
,
139 char *remoteurl
= xstrdup(remote_url
);
140 struct strbuf sb
= STRBUF_INIT
;
141 size_t len
= strlen(remoteurl
);
143 if (is_dir_sep(remoteurl
[len
-1]))
144 remoteurl
[len
-1] = '\0';
146 if (!url_is_local_not_ssh(remoteurl
) || is_absolute_path(remoteurl
))
151 * Prepend a './' to ensure all relative
152 * remoteurls start with './' or '../'
154 if (!starts_with_dot_slash(remoteurl
) &&
155 !starts_with_dot_dot_slash(remoteurl
)) {
157 strbuf_addf(&sb
, "./%s", remoteurl
);
159 remoteurl
= strbuf_detach(&sb
, NULL
);
163 * When the url starts with '../', remove that and the
164 * last directory in remoteurl.
167 if (starts_with_dot_dot_slash(url
)) {
169 colonsep
|= chop_last_dir(&remoteurl
, is_relative
);
170 } else if (starts_with_dot_slash(url
))
176 strbuf_addf(&sb
, "%s%s%s", remoteurl
, colonsep
? ":" : "/", url
);
177 if (ends_with(url
, "/"))
178 strbuf_setlen(&sb
, sb
.len
- 1);
181 if (starts_with_dot_slash(sb
.buf
))
182 out
= xstrdup(sb
.buf
+ 2);
184 out
= xstrdup(sb
.buf
);
187 if (!up_path
|| !is_relative
)
190 strbuf_addf(&sb
, "%s%s", up_path
, out
);
192 return strbuf_detach(&sb
, NULL
);
195 static int resolve_relative_url(int argc
, const char **argv
, const char *prefix
)
197 char *remoteurl
= NULL
;
198 char *remote
= get_default_remote();
199 const char *up_path
= NULL
;
202 struct strbuf sb
= STRBUF_INIT
;
204 if (argc
!= 2 && argc
!= 3)
205 die("resolve-relative-url only accepts one or two arguments");
208 strbuf_addf(&sb
, "remote.%s.url", remote
);
211 if (git_config_get_string(sb
.buf
, &remoteurl
))
212 /* the repository is its own authoritative upstream */
213 remoteurl
= xgetcwd();
218 res
= relative_url(remoteurl
, url
, up_path
);
225 static int resolve_relative_url_test(int argc
, const char **argv
, const char *prefix
)
227 char *remoteurl
, *res
;
228 const char *up_path
, *url
;
231 die("resolve-relative-url-test only accepts three arguments: <up_path> <remoteurl> <url>");
234 remoteurl
= xstrdup(argv
[2]);
237 if (!strcmp(up_path
, "(null)"))
240 res
= relative_url(remoteurl
, url
, up_path
);
247 /* the result should be freed by the caller. */
248 static char *get_submodule_displaypath(const char *path
, const char *prefix
)
250 const char *super_prefix
= get_super_prefix();
252 if (prefix
&& super_prefix
) {
253 BUG("cannot have prefix '%s' and superprefix '%s'",
254 prefix
, super_prefix
);
256 struct strbuf sb
= STRBUF_INIT
;
257 char *displaypath
= xstrdup(relative_path(path
, prefix
, &sb
));
260 } else if (super_prefix
) {
261 return xstrfmt("%s%s", super_prefix
, path
);
263 return xstrdup(path
);
267 static char *compute_rev_name(const char *sub_path
, const char* object_id
)
269 struct strbuf sb
= STRBUF_INIT
;
272 static const char *describe_bare
[] = { NULL
};
274 static const char *describe_tags
[] = { "--tags", NULL
};
276 static const char *describe_contains
[] = { "--contains", NULL
};
278 static const char *describe_all_always
[] = { "--all", "--always", NULL
};
280 static const char **describe_argv
[] = { describe_bare
, describe_tags
,
282 describe_all_always
, NULL
};
284 for (d
= describe_argv
; *d
; d
++) {
285 struct child_process cp
= CHILD_PROCESS_INIT
;
286 prepare_submodule_repo_env(&cp
.env_array
);
291 argv_array_push(&cp
.args
, "describe");
292 argv_array_pushv(&cp
.args
, *d
);
293 argv_array_push(&cp
.args
, object_id
);
295 if (!capture_command(&cp
, &sb
, 0)) {
296 strbuf_strip_suffix(&sb
, "\n");
297 return strbuf_detach(&sb
, NULL
);
306 const struct cache_entry
**entries
;
309 #define MODULE_LIST_INIT { NULL, 0, 0 }
311 static int module_list_compute(int argc
, const char **argv
,
313 struct pathspec
*pathspec
,
314 struct module_list
*list
)
317 char *ps_matched
= NULL
;
318 parse_pathspec(pathspec
, 0,
319 PATHSPEC_PREFER_FULL
,
323 ps_matched
= xcalloc(pathspec
->nr
, 1);
325 if (read_cache() < 0)
326 die(_("index file corrupt"));
328 for (i
= 0; i
< active_nr
; i
++) {
329 const struct cache_entry
*ce
= active_cache
[i
];
331 if (!match_pathspec(pathspec
, ce
->name
, ce_namelen(ce
),
333 !S_ISGITLINK(ce
->ce_mode
))
336 ALLOC_GROW(list
->entries
, list
->nr
+ 1, list
->alloc
);
337 list
->entries
[list
->nr
++] = ce
;
338 while (i
+ 1 < active_nr
&&
339 !strcmp(ce
->name
, active_cache
[i
+ 1]->name
))
341 * Skip entries with the same name in different stages
342 * to make sure an entry is returned only once.
347 if (ps_matched
&& report_path_error(ps_matched
, pathspec
, prefix
))
355 static void module_list_active(struct module_list
*list
)
358 struct module_list active_modules
= MODULE_LIST_INIT
;
360 for (i
= 0; i
< list
->nr
; i
++) {
361 const struct cache_entry
*ce
= list
->entries
[i
];
363 if (!is_submodule_active(the_repository
, ce
->name
))
366 ALLOC_GROW(active_modules
.entries
,
367 active_modules
.nr
+ 1,
368 active_modules
.alloc
);
369 active_modules
.entries
[active_modules
.nr
++] = ce
;
373 *list
= active_modules
;
376 static char *get_up_path(const char *path
)
379 struct strbuf sb
= STRBUF_INIT
;
381 for (i
= count_slashes(path
); i
; i
--)
382 strbuf_addstr(&sb
, "../");
385 * Check if 'path' ends with slash or not
386 * for having the same output for dir/sub_dir
389 if (!is_dir_sep(path
[strlen(path
) - 1]))
390 strbuf_addstr(&sb
, "../");
392 return strbuf_detach(&sb
, NULL
);
395 static int module_list(int argc
, const char **argv
, const char *prefix
)
398 struct pathspec pathspec
;
399 struct module_list list
= MODULE_LIST_INIT
;
401 struct option module_list_options
[] = {
402 OPT_STRING(0, "prefix", &prefix
,
404 N_("alternative anchor for relative paths")),
408 const char *const git_submodule_helper_usage
[] = {
409 N_("git submodule--helper list [--prefix=<path>] [<path>...]"),
413 argc
= parse_options(argc
, argv
, prefix
, module_list_options
,
414 git_submodule_helper_usage
, 0);
416 if (module_list_compute(argc
, argv
, prefix
, &pathspec
, &list
) < 0)
419 for (i
= 0; i
< list
.nr
; i
++) {
420 const struct cache_entry
*ce
= list
.entries
[i
];
423 printf("%06o %s U\t", ce
->ce_mode
, sha1_to_hex(null_sha1
));
425 printf("%06o %s %d\t", ce
->ce_mode
,
426 oid_to_hex(&ce
->oid
), ce_stage(ce
));
428 fprintf(stdout
, "%s\n", ce
->name
);
433 static void for_each_listed_submodule(const struct module_list
*list
,
434 each_submodule_fn fn
, void *cb_data
)
437 for (i
= 0; i
< list
->nr
; i
++)
438 fn(list
->entries
[i
], cb_data
);
446 #define INIT_CB_INIT { NULL, 0 }
448 static void init_submodule(const char *path
, const char *prefix
,
451 const struct submodule
*sub
;
452 struct strbuf sb
= STRBUF_INIT
;
453 char *upd
= NULL
, *url
= NULL
, *displaypath
;
455 displaypath
= get_submodule_displaypath(path
, prefix
);
457 sub
= submodule_from_path(&null_oid
, path
);
460 die(_("No url found for submodule path '%s' in .gitmodules"),
464 * NEEDSWORK: In a multi-working-tree world, this needs to be
465 * set in the per-worktree config.
467 * Set active flag for the submodule being initialized
469 if (!is_submodule_active(the_repository
, path
)) {
470 strbuf_addf(&sb
, "submodule.%s.active", sub
->name
);
471 git_config_set_gently(sb
.buf
, "true");
476 * Copy url setting when it is not set yet.
477 * To look up the url in .git/config, we must not fall back to
478 * .gitmodules, so look it up directly.
480 strbuf_addf(&sb
, "submodule.%s.url", sub
->name
);
481 if (git_config_get_string(sb
.buf
, &url
)) {
483 die(_("No url found for submodule path '%s' in .gitmodules"),
486 url
= xstrdup(sub
->url
);
488 /* Possibly a url relative to parent */
489 if (starts_with_dot_dot_slash(url
) ||
490 starts_with_dot_slash(url
)) {
491 char *remoteurl
, *relurl
;
492 char *remote
= get_default_remote();
493 struct strbuf remotesb
= STRBUF_INIT
;
494 strbuf_addf(&remotesb
, "remote.%s.url", remote
);
497 if (git_config_get_string(remotesb
.buf
, &remoteurl
)) {
498 warning(_("could not lookup configuration '%s'. Assuming this repository is its own authoritative upstream."), remotesb
.buf
);
499 remoteurl
= xgetcwd();
501 relurl
= relative_url(remoteurl
, url
, NULL
);
502 strbuf_release(&remotesb
);
508 if (git_config_set_gently(sb
.buf
, url
))
509 die(_("Failed to register url for submodule path '%s'"),
511 if (!(flags
& OPT_QUIET
))
513 _("Submodule '%s' (%s) registered for path '%s'\n"),
514 sub
->name
, url
, displaypath
);
518 /* Copy "update" setting when it is not set yet */
519 strbuf_addf(&sb
, "submodule.%s.update", sub
->name
);
520 if (git_config_get_string(sb
.buf
, &upd
) &&
521 sub
->update_strategy
.type
!= SM_UPDATE_UNSPECIFIED
) {
522 if (sub
->update_strategy
.type
== SM_UPDATE_COMMAND
) {
523 fprintf(stderr
, _("warning: command update mode suggested for submodule '%s'\n"),
525 upd
= xstrdup("none");
527 upd
= xstrdup(submodule_strategy_to_string(&sub
->update_strategy
));
529 if (git_config_set_gently(sb
.buf
, upd
))
530 die(_("Failed to register update mode for submodule path '%s'"), displaypath
);
538 static void init_submodule_cb(const struct cache_entry
*list_item
, void *cb_data
)
540 struct init_cb
*info
= cb_data
;
541 init_submodule(list_item
->name
, info
->prefix
, info
->flags
);
544 static int module_init(int argc
, const char **argv
, const char *prefix
)
546 struct init_cb info
= INIT_CB_INIT
;
547 struct pathspec pathspec
;
548 struct module_list list
= MODULE_LIST_INIT
;
551 struct option module_init_options
[] = {
552 OPT__QUIET(&quiet
, N_("Suppress output for initializing a submodule")),
556 const char *const git_submodule_helper_usage
[] = {
557 N_("git submodule--helper init [<path>]"),
561 argc
= parse_options(argc
, argv
, prefix
, module_init_options
,
562 git_submodule_helper_usage
, 0);
564 if (module_list_compute(argc
, argv
, prefix
, &pathspec
, &list
) < 0)
568 * If there are no path args and submodule.active is set then,
569 * by default, only initialize 'active' modules.
571 if (!argc
&& git_config_get_value_multi("submodule.active"))
572 module_list_active(&list
);
574 info
.prefix
= prefix
;
576 info
.flags
|= OPT_QUIET
;
578 for_each_listed_submodule(&list
, init_submodule_cb
, &info
);
588 #define STATUS_CB_INIT { NULL, 0 }
590 static void print_status(unsigned int flags
, char state
, const char *path
,
591 const struct object_id
*oid
, const char *displaypath
)
593 if (flags
& OPT_QUIET
)
596 printf("%c%s %s", state
, oid_to_hex(oid
), displaypath
);
598 if (state
== ' ' || state
== '+')
599 printf(" (%s)", compute_rev_name(path
, oid_to_hex(oid
)));
604 static int handle_submodule_head_ref(const char *refname
,
605 const struct object_id
*oid
, int flags
,
608 struct object_id
*output
= cb_data
;
615 static void status_submodule(const char *path
, const struct object_id
*ce_oid
,
616 unsigned int ce_flags
, const char *prefix
,
620 struct argv_array diff_files_args
= ARGV_ARRAY_INIT
;
622 int diff_files_result
;
624 if (!submodule_from_path(&null_oid
, path
))
625 die(_("no submodule mapping found in .gitmodules for path '%s'"),
628 displaypath
= get_submodule_displaypath(path
, prefix
);
630 if ((CE_STAGEMASK
& ce_flags
) >> CE_STAGESHIFT
) {
631 print_status(flags
, 'U', path
, &null_oid
, displaypath
);
635 if (!is_submodule_active(the_repository
, path
)) {
636 print_status(flags
, '-', path
, ce_oid
, displaypath
);
640 argv_array_pushl(&diff_files_args
, "diff-files",
641 "--ignore-submodules=dirty", "--quiet", "--",
644 git_config(git_diff_basic_config
, NULL
);
645 init_revisions(&rev
, prefix
);
647 diff_files_args
.argc
= setup_revisions(diff_files_args
.argc
,
648 diff_files_args
.argv
,
650 diff_files_result
= run_diff_files(&rev
, 0);
652 if (!diff_result_code(&rev
.diffopt
, diff_files_result
)) {
653 print_status(flags
, ' ', path
, ce_oid
,
655 } else if (!(flags
& OPT_CACHED
)) {
656 struct object_id oid
;
658 if (refs_head_ref(get_submodule_ref_store(path
),
659 handle_submodule_head_ref
, &oid
))
660 die(_("could not resolve HEAD ref inside the "
661 "submodule '%s'"), path
);
663 print_status(flags
, '+', path
, &oid
, displaypath
);
665 print_status(flags
, '+', path
, ce_oid
, displaypath
);
668 if (flags
& OPT_RECURSIVE
) {
669 struct child_process cpr
= CHILD_PROCESS_INIT
;
673 prepare_submodule_repo_env(&cpr
.env_array
);
675 argv_array_push(&cpr
.args
, "--super-prefix");
676 argv_array_pushf(&cpr
.args
, "%s/", displaypath
);
677 argv_array_pushl(&cpr
.args
, "submodule--helper", "status",
678 "--recursive", NULL
);
680 if (flags
& OPT_CACHED
)
681 argv_array_push(&cpr
.args
, "--cached");
683 if (flags
& OPT_QUIET
)
684 argv_array_push(&cpr
.args
, "--quiet");
686 if (run_command(&cpr
))
687 die(_("failed to recurse into submodule '%s'"), path
);
691 argv_array_clear(&diff_files_args
);
695 static void status_submodule_cb(const struct cache_entry
*list_item
,
698 struct status_cb
*info
= cb_data
;
699 status_submodule(list_item
->name
, &list_item
->oid
, list_item
->ce_flags
,
700 info
->prefix
, info
->flags
);
703 static int module_status(int argc
, const char **argv
, const char *prefix
)
705 struct status_cb info
= STATUS_CB_INIT
;
706 struct pathspec pathspec
;
707 struct module_list list
= MODULE_LIST_INIT
;
710 struct option module_status_options
[] = {
711 OPT__QUIET(&quiet
, N_("Suppress submodule status output")),
712 OPT_BIT(0, "cached", &info
.flags
, N_("Use commit stored in the index instead of the one stored in the submodule HEAD"), OPT_CACHED
),
713 OPT_BIT(0, "recursive", &info
.flags
, N_("recurse into nested submodules"), OPT_RECURSIVE
),
717 const char *const git_submodule_helper_usage
[] = {
718 N_("git submodule status [--quiet] [--cached] [--recursive] [<path>...]"),
722 argc
= parse_options(argc
, argv
, prefix
, module_status_options
,
723 git_submodule_helper_usage
, 0);
725 if (module_list_compute(argc
, argv
, prefix
, &pathspec
, &list
) < 0)
728 info
.prefix
= prefix
;
730 info
.flags
|= OPT_QUIET
;
732 for_each_listed_submodule(&list
, status_submodule_cb
, &info
);
737 static int module_name(int argc
, const char **argv
, const char *prefix
)
739 const struct submodule
*sub
;
742 usage(_("git submodule--helper name <path>"));
744 sub
= submodule_from_path(&null_oid
, argv
[1]);
747 die(_("no submodule mapping found in .gitmodules for path '%s'"),
750 printf("%s\n", sub
->name
);
760 #define SYNC_CB_INIT { NULL, 0 }
762 static void sync_submodule(const char *path
, const char *prefix
,
765 const struct submodule
*sub
;
766 char *remote_key
= NULL
;
767 char *sub_origin_url
, *super_config_url
, *displaypath
;
768 struct strbuf sb
= STRBUF_INIT
;
769 struct child_process cp
= CHILD_PROCESS_INIT
;
770 char *sub_config_path
= NULL
;
772 if (!is_submodule_active(the_repository
, path
))
775 sub
= submodule_from_path(&null_oid
, path
);
777 if (sub
&& sub
->url
) {
778 if (starts_with_dot_dot_slash(sub
->url
) ||
779 starts_with_dot_slash(sub
->url
)) {
780 char *remote_url
, *up_path
;
781 char *remote
= get_default_remote();
782 strbuf_addf(&sb
, "remote.%s.url", remote
);
784 if (git_config_get_string(sb
.buf
, &remote_url
))
785 remote_url
= xgetcwd();
787 up_path
= get_up_path(path
);
788 sub_origin_url
= relative_url(remote_url
, sub
->url
, up_path
);
789 super_config_url
= relative_url(remote_url
, sub
->url
, NULL
);
795 sub_origin_url
= xstrdup(sub
->url
);
796 super_config_url
= xstrdup(sub
->url
);
799 sub_origin_url
= xstrdup("");
800 super_config_url
= xstrdup("");
803 displaypath
= get_submodule_displaypath(path
, prefix
);
805 if (!(flags
& OPT_QUIET
))
806 printf(_("Synchronizing submodule url for '%s'\n"),
810 strbuf_addf(&sb
, "submodule.%s.url", sub
->name
);
811 if (git_config_set_gently(sb
.buf
, super_config_url
))
812 die(_("failed to register url for submodule path '%s'"),
815 if (!is_submodule_populated_gently(path
, NULL
))
818 prepare_submodule_repo_env(&cp
.env_array
);
821 argv_array_pushl(&cp
.args
, "submodule--helper",
822 "print-default-remote", NULL
);
825 if (capture_command(&cp
, &sb
, 0))
826 die(_("failed to get the default remote for submodule '%s'"),
829 strbuf_strip_suffix(&sb
, "\n");
830 remote_key
= xstrfmt("remote.%s.url", sb
.buf
);
833 submodule_to_gitdir(&sb
, path
);
834 strbuf_addstr(&sb
, "/config");
836 if (git_config_set_in_file_gently(sb
.buf
, remote_key
, sub_origin_url
))
837 die(_("failed to update remote for submodule '%s'"),
840 if (flags
& OPT_RECURSIVE
) {
841 struct child_process cpr
= CHILD_PROCESS_INIT
;
845 prepare_submodule_repo_env(&cpr
.env_array
);
847 argv_array_push(&cpr
.args
, "--super-prefix");
848 argv_array_pushf(&cpr
.args
, "%s/", displaypath
);
849 argv_array_pushl(&cpr
.args
, "submodule--helper", "sync",
850 "--recursive", NULL
);
852 if (flags
& OPT_QUIET
)
853 argv_array_push(&cpr
.args
, "--quiet");
855 if (run_command(&cpr
))
856 die(_("failed to recurse into submodule '%s'"),
861 free(super_config_url
);
862 free(sub_origin_url
);
866 free(sub_config_path
);
869 static void sync_submodule_cb(const struct cache_entry
*list_item
, void *cb_data
)
871 struct sync_cb
*info
= cb_data
;
872 sync_submodule(list_item
->name
, info
->prefix
, info
->flags
);
876 static int module_sync(int argc
, const char **argv
, const char *prefix
)
878 struct sync_cb info
= SYNC_CB_INIT
;
879 struct pathspec pathspec
;
880 struct module_list list
= MODULE_LIST_INIT
;
884 struct option module_sync_options
[] = {
885 OPT__QUIET(&quiet
, N_("Suppress output of synchronizing submodule url")),
886 OPT_BOOL(0, "recursive", &recursive
,
887 N_("Recurse into nested submodules")),
891 const char *const git_submodule_helper_usage
[] = {
892 N_("git submodule--helper sync [--quiet] [--recursive] [<path>]"),
896 argc
= parse_options(argc
, argv
, prefix
, module_sync_options
,
897 git_submodule_helper_usage
, 0);
899 if (module_list_compute(argc
, argv
, prefix
, &pathspec
, &list
) < 0)
902 info
.prefix
= prefix
;
904 info
.flags
|= OPT_QUIET
;
906 info
.flags
|= OPT_RECURSIVE
;
908 for_each_listed_submodule(&list
, sync_submodule_cb
, &info
);
917 #define DEINIT_CB_INIT { NULL, 0 }
919 static void deinit_submodule(const char *path
, const char *prefix
,
922 const struct submodule
*sub
;
923 char *displaypath
= NULL
;
924 struct child_process cp_config
= CHILD_PROCESS_INIT
;
925 struct strbuf sb_config
= STRBUF_INIT
;
926 char *sub_git_dir
= xstrfmt("%s/.git", path
);
928 sub
= submodule_from_path(&null_oid
, path
);
930 if (!sub
|| !sub
->name
)
933 displaypath
= get_submodule_displaypath(path
, prefix
);
935 /* remove the submodule work tree (unless the user already did it) */
936 if (is_directory(path
)) {
937 struct strbuf sb_rm
= STRBUF_INIT
;
941 * protect submodules containing a .git directory
942 * NEEDSWORK: instead of dying, automatically call
943 * absorbgitdirs and (possibly) warn.
945 if (is_directory(sub_git_dir
))
946 die(_("Submodule work tree '%s' contains a .git "
947 "directory (use 'rm -rf' if you really want "
948 "to remove it including all of its history)"),
951 if (!(flags
& OPT_FORCE
)) {
952 struct child_process cp_rm
= CHILD_PROCESS_INIT
;
954 argv_array_pushl(&cp_rm
.args
, "rm", "-qn",
957 if (run_command(&cp_rm
))
958 die(_("Submodule work tree '%s' contains local "
959 "modifications; use '-f' to discard them"),
963 strbuf_addstr(&sb_rm
, path
);
965 if (!remove_dir_recursively(&sb_rm
, 0))
966 format
= _("Cleared directory '%s'\n");
968 format
= _("Could not remove submodule work tree '%s'\n");
970 if (!(flags
& OPT_QUIET
))
971 printf(format
, displaypath
);
973 strbuf_release(&sb_rm
);
976 if (mkdir(path
, 0777))
977 printf(_("could not create empty submodule directory %s"),
980 cp_config
.git_cmd
= 1;
981 argv_array_pushl(&cp_config
.args
, "config", "--get-regexp", NULL
);
982 argv_array_pushf(&cp_config
.args
, "submodule.%s\\.", sub
->name
);
984 /* remove the .git/config entries (unless the user already did it) */
985 if (!capture_command(&cp_config
, &sb_config
, 0) && sb_config
.len
) {
986 char *sub_key
= xstrfmt("submodule.%s", sub
->name
);
988 * remove the whole section so we have a clean state when
989 * the user later decides to init this submodule again
991 git_config_rename_section_in_file(NULL
, sub_key
, NULL
);
992 if (!(flags
& OPT_QUIET
))
993 printf(_("Submodule '%s' (%s) unregistered for path '%s'\n"),
994 sub
->name
, sub
->url
, displaypath
);
1001 strbuf_release(&sb_config
);
1004 static void deinit_submodule_cb(const struct cache_entry
*list_item
,
1007 struct deinit_cb
*info
= cb_data
;
1008 deinit_submodule(list_item
->name
, info
->prefix
, info
->flags
);
1011 static int module_deinit(int argc
, const char **argv
, const char *prefix
)
1013 struct deinit_cb info
= DEINIT_CB_INIT
;
1014 struct pathspec pathspec
;
1015 struct module_list list
= MODULE_LIST_INIT
;
1020 struct option module_deinit_options
[] = {
1021 OPT__QUIET(&quiet
, N_("Suppress submodule status output")),
1022 OPT__FORCE(&force
, N_("Remove submodule working trees even if they contain local changes"), 0),
1023 OPT_BOOL(0, "all", &all
, N_("Unregister all submodules")),
1027 const char *const git_submodule_helper_usage
[] = {
1028 N_("git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"),
1032 argc
= parse_options(argc
, argv
, prefix
, module_deinit_options
,
1033 git_submodule_helper_usage
, 0);
1036 error("pathspec and --all are incompatible");
1037 usage_with_options(git_submodule_helper_usage
,
1038 module_deinit_options
);
1042 die(_("Use '--all' if you really want to deinitialize all submodules"));
1044 if (module_list_compute(argc
, argv
, prefix
, &pathspec
, &list
) < 0)
1047 info
.prefix
= prefix
;
1049 info
.flags
|= OPT_QUIET
;
1051 info
.flags
|= OPT_FORCE
;
1053 for_each_listed_submodule(&list
, deinit_submodule_cb
, &info
);
1058 static int clone_submodule(const char *path
, const char *gitdir
, const char *url
,
1059 const char *depth
, struct string_list
*reference
,
1060 int quiet
, int progress
)
1062 struct child_process cp
= CHILD_PROCESS_INIT
;
1064 argv_array_push(&cp
.args
, "clone");
1065 argv_array_push(&cp
.args
, "--no-checkout");
1067 argv_array_push(&cp
.args
, "--quiet");
1069 argv_array_push(&cp
.args
, "--progress");
1070 if (depth
&& *depth
)
1071 argv_array_pushl(&cp
.args
, "--depth", depth
, NULL
);
1072 if (reference
->nr
) {
1073 struct string_list_item
*item
;
1074 for_each_string_list_item(item
, reference
)
1075 argv_array_pushl(&cp
.args
, "--reference",
1076 item
->string
, NULL
);
1078 if (gitdir
&& *gitdir
)
1079 argv_array_pushl(&cp
.args
, "--separate-git-dir", gitdir
, NULL
);
1081 argv_array_push(&cp
.args
, url
);
1082 argv_array_push(&cp
.args
, path
);
1085 prepare_submodule_repo_env(&cp
.env_array
);
1088 return run_command(&cp
);
1091 struct submodule_alternate_setup
{
1092 const char *submodule_name
;
1093 enum SUBMODULE_ALTERNATE_ERROR_MODE
{
1094 SUBMODULE_ALTERNATE_ERROR_DIE
,
1095 SUBMODULE_ALTERNATE_ERROR_INFO
,
1096 SUBMODULE_ALTERNATE_ERROR_IGNORE
1098 struct string_list
*reference
;
1100 #define SUBMODULE_ALTERNATE_SETUP_INIT { NULL, \
1101 SUBMODULE_ALTERNATE_ERROR_IGNORE, NULL }
1103 static int add_possible_reference_from_superproject(
1104 struct alternate_object_database
*alt
, void *sas_cb
)
1106 struct submodule_alternate_setup
*sas
= sas_cb
;
1109 * If the alternate object store is another repository, try the
1110 * standard layout with .git/(modules/<name>)+/objects
1112 if (ends_with(alt
->path
, "/objects")) {
1114 struct strbuf sb
= STRBUF_INIT
;
1115 struct strbuf err
= STRBUF_INIT
;
1116 strbuf_add(&sb
, alt
->path
, strlen(alt
->path
) - strlen("objects"));
1119 * We need to end the new path with '/' to mark it as a dir,
1120 * otherwise a submodule name containing '/' will be broken
1121 * as the last part of a missing submodule reference would
1122 * be taken as a file name.
1124 strbuf_addf(&sb
, "modules/%s/", sas
->submodule_name
);
1126 sm_alternate
= compute_alternate_path(sb
.buf
, &err
);
1128 string_list_append(sas
->reference
, xstrdup(sb
.buf
));
1131 switch (sas
->error_mode
) {
1132 case SUBMODULE_ALTERNATE_ERROR_DIE
:
1133 die(_("submodule '%s' cannot add alternate: %s"),
1134 sas
->submodule_name
, err
.buf
);
1135 case SUBMODULE_ALTERNATE_ERROR_INFO
:
1136 fprintf(stderr
, _("submodule '%s' cannot add alternate: %s"),
1137 sas
->submodule_name
, err
.buf
);
1138 case SUBMODULE_ALTERNATE_ERROR_IGNORE
:
1142 strbuf_release(&sb
);
1148 static void prepare_possible_alternates(const char *sm_name
,
1149 struct string_list
*reference
)
1151 char *sm_alternate
= NULL
, *error_strategy
= NULL
;
1152 struct submodule_alternate_setup sas
= SUBMODULE_ALTERNATE_SETUP_INIT
;
1154 git_config_get_string("submodule.alternateLocation", &sm_alternate
);
1158 git_config_get_string("submodule.alternateErrorStrategy", &error_strategy
);
1160 if (!error_strategy
)
1161 error_strategy
= xstrdup("die");
1163 sas
.submodule_name
= sm_name
;
1164 sas
.reference
= reference
;
1165 if (!strcmp(error_strategy
, "die"))
1166 sas
.error_mode
= SUBMODULE_ALTERNATE_ERROR_DIE
;
1167 else if (!strcmp(error_strategy
, "info"))
1168 sas
.error_mode
= SUBMODULE_ALTERNATE_ERROR_INFO
;
1169 else if (!strcmp(error_strategy
, "ignore"))
1170 sas
.error_mode
= SUBMODULE_ALTERNATE_ERROR_IGNORE
;
1172 die(_("Value '%s' for submodule.alternateErrorStrategy is not recognized"), error_strategy
);
1174 if (!strcmp(sm_alternate
, "superproject"))
1175 foreach_alt_odb(add_possible_reference_from_superproject
, &sas
);
1176 else if (!strcmp(sm_alternate
, "no"))
1179 die(_("Value '%s' for submodule.alternateLocation is not recognized"), sm_alternate
);
1182 free(error_strategy
);
1185 static int module_clone(int argc
, const char **argv
, const char *prefix
)
1187 const char *name
= NULL
, *url
= NULL
, *depth
= NULL
;
1190 char *p
, *path
= NULL
, *sm_gitdir
;
1191 struct strbuf sb
= STRBUF_INIT
;
1192 struct string_list reference
= STRING_LIST_INIT_NODUP
;
1193 char *sm_alternate
= NULL
, *error_strategy
= NULL
;
1195 struct option module_clone_options
[] = {
1196 OPT_STRING(0, "prefix", &prefix
,
1198 N_("alternative anchor for relative paths")),
1199 OPT_STRING(0, "path", &path
,
1201 N_("where the new submodule will be cloned to")),
1202 OPT_STRING(0, "name", &name
,
1204 N_("name of the new submodule")),
1205 OPT_STRING(0, "url", &url
,
1207 N_("url where to clone the submodule from")),
1208 OPT_STRING_LIST(0, "reference", &reference
,
1210 N_("reference repository")),
1211 OPT_STRING(0, "depth", &depth
,
1213 N_("depth for shallow clones")),
1214 OPT__QUIET(&quiet
, "Suppress output for cloning a submodule"),
1215 OPT_BOOL(0, "progress", &progress
,
1216 N_("force cloning progress")),
1220 const char *const git_submodule_helper_usage
[] = {
1221 N_("git submodule--helper clone [--prefix=<path>] [--quiet] "
1222 "[--reference <repository>] [--name <name>] [--depth <depth>] "
1223 "--url <url> --path <path>"),
1227 argc
= parse_options(argc
, argv
, prefix
, module_clone_options
,
1228 git_submodule_helper_usage
, 0);
1230 if (argc
|| !url
|| !path
|| !*path
)
1231 usage_with_options(git_submodule_helper_usage
,
1232 module_clone_options
);
1234 strbuf_addf(&sb
, "%s/modules/%s", get_git_dir(), name
);
1235 sm_gitdir
= absolute_pathdup(sb
.buf
);
1238 if (!is_absolute_path(path
)) {
1239 strbuf_addf(&sb
, "%s/%s", get_git_work_tree(), path
);
1240 path
= strbuf_detach(&sb
, NULL
);
1242 path
= xstrdup(path
);
1244 if (!file_exists(sm_gitdir
)) {
1245 if (safe_create_leading_directories_const(sm_gitdir
) < 0)
1246 die(_("could not create directory '%s'"), sm_gitdir
);
1248 prepare_possible_alternates(name
, &reference
);
1250 if (clone_submodule(path
, sm_gitdir
, url
, depth
, &reference
,
1252 die(_("clone of '%s' into submodule path '%s' failed"),
1255 if (safe_create_leading_directories_const(path
) < 0)
1256 die(_("could not create directory '%s'"), path
);
1257 strbuf_addf(&sb
, "%s/index", sm_gitdir
);
1258 unlink_or_warn(sb
.buf
);
1262 /* Connect module worktree and git dir */
1263 connect_work_tree_and_git_dir(path
, sm_gitdir
);
1265 p
= git_pathdup_submodule(path
, "config");
1267 die(_("could not get submodule directory for '%s'"), path
);
1269 /* setup alternateLocation and alternateErrorStrategy in the cloned submodule if needed */
1270 git_config_get_string("submodule.alternateLocation", &sm_alternate
);
1272 git_config_set_in_file(p
, "submodule.alternateLocation",
1274 git_config_get_string("submodule.alternateErrorStrategy", &error_strategy
);
1276 git_config_set_in_file(p
, "submodule.alternateErrorStrategy",
1280 free(error_strategy
);
1282 strbuf_release(&sb
);
1289 struct submodule_update_clone
{
1290 /* index into 'list', the list of submodules to look into for cloning */
1292 struct module_list list
;
1293 unsigned warn_if_uninitialized
: 1;
1295 /* update parameter passed via commandline */
1296 struct submodule_update_strategy update
;
1298 /* configuration parameters which are passed on to the children */
1301 int recommend_shallow
;
1302 struct string_list references
;
1304 const char *recursive_prefix
;
1307 /* Machine-readable status lines to be consumed by git-submodule.sh */
1308 struct string_list projectlines
;
1310 /* If we want to stop as fast as possible and return an error */
1311 unsigned quickstop
: 1;
1313 /* failed clones to be retried again */
1314 const struct cache_entry
**failed_clones
;
1315 int failed_clones_nr
, failed_clones_alloc
;
1317 #define SUBMODULE_UPDATE_CLONE_INIT {0, MODULE_LIST_INIT, 0, \
1318 SUBMODULE_UPDATE_STRATEGY_INIT, 0, 0, -1, STRING_LIST_INIT_DUP, \
1320 STRING_LIST_INIT_DUP, 0, NULL, 0, 0}
1323 static void next_submodule_warn_missing(struct submodule_update_clone
*suc
,
1324 struct strbuf
*out
, const char *displaypath
)
1327 * Only mention uninitialized submodules when their
1328 * paths have been specified.
1330 if (suc
->warn_if_uninitialized
) {
1332 _("Submodule path '%s' not initialized"),
1334 strbuf_addch(out
, '\n');
1336 _("Maybe you want to use 'update --init'?"));
1337 strbuf_addch(out
, '\n');
1342 * Determine whether 'ce' needs to be cloned. If so, prepare the 'child' to
1343 * run the clone. Returns 1 if 'ce' needs to be cloned, 0 otherwise.
1345 static int prepare_to_clone_next_submodule(const struct cache_entry
*ce
,
1346 struct child_process
*child
,
1347 struct submodule_update_clone
*suc
,
1350 const struct submodule
*sub
= NULL
;
1351 const char *url
= NULL
;
1352 const char *update_string
;
1353 enum submodule_update_type update_type
;
1355 struct strbuf displaypath_sb
= STRBUF_INIT
;
1356 struct strbuf sb
= STRBUF_INIT
;
1357 const char *displaypath
= NULL
;
1358 int needs_cloning
= 0;
1361 if (suc
->recursive_prefix
)
1362 strbuf_addf(&sb
, "%s/%s", suc
->recursive_prefix
, ce
->name
);
1364 strbuf_addstr(&sb
, ce
->name
);
1365 strbuf_addf(out
, _("Skipping unmerged submodule %s"), sb
.buf
);
1366 strbuf_addch(out
, '\n');
1370 sub
= submodule_from_path(&null_oid
, ce
->name
);
1372 if (suc
->recursive_prefix
)
1373 displaypath
= relative_path(suc
->recursive_prefix
,
1374 ce
->name
, &displaypath_sb
);
1376 displaypath
= ce
->name
;
1379 next_submodule_warn_missing(suc
, out
, displaypath
);
1383 key
= xstrfmt("submodule.%s.update", sub
->name
);
1384 if (!repo_config_get_string_const(the_repository
, key
, &update_string
)) {
1385 update_type
= parse_submodule_update_type(update_string
);
1387 update_type
= sub
->update_strategy
.type
;
1391 if (suc
->update
.type
== SM_UPDATE_NONE
1392 || (suc
->update
.type
== SM_UPDATE_UNSPECIFIED
1393 && update_type
== SM_UPDATE_NONE
)) {
1394 strbuf_addf(out
, _("Skipping submodule '%s'"), displaypath
);
1395 strbuf_addch(out
, '\n');
1399 /* Check if the submodule has been initialized. */
1400 if (!is_submodule_active(the_repository
, ce
->name
)) {
1401 next_submodule_warn_missing(suc
, out
, displaypath
);
1406 strbuf_addf(&sb
, "submodule.%s.url", sub
->name
);
1407 if (repo_config_get_string_const(the_repository
, sb
.buf
, &url
))
1411 strbuf_addf(&sb
, "%s/.git", ce
->name
);
1412 needs_cloning
= !file_exists(sb
.buf
);
1415 strbuf_addf(&sb
, "%06o %s %d %d\t%s\n", ce
->ce_mode
,
1416 oid_to_hex(&ce
->oid
), ce_stage(ce
),
1417 needs_cloning
, ce
->name
);
1418 string_list_append(&suc
->projectlines
, sb
.buf
);
1424 child
->no_stdin
= 1;
1425 child
->stdout_to_stderr
= 1;
1427 argv_array_push(&child
->args
, "submodule--helper");
1428 argv_array_push(&child
->args
, "clone");
1430 argv_array_push(&child
->args
, "--progress");
1432 argv_array_push(&child
->args
, "--quiet");
1434 argv_array_pushl(&child
->args
, "--prefix", suc
->prefix
, NULL
);
1435 if (suc
->recommend_shallow
&& sub
->recommend_shallow
== 1)
1436 argv_array_push(&child
->args
, "--depth=1");
1437 argv_array_pushl(&child
->args
, "--path", sub
->path
, NULL
);
1438 argv_array_pushl(&child
->args
, "--name", sub
->name
, NULL
);
1439 argv_array_pushl(&child
->args
, "--url", url
, NULL
);
1440 if (suc
->references
.nr
) {
1441 struct string_list_item
*item
;
1442 for_each_string_list_item(item
, &suc
->references
)
1443 argv_array_pushl(&child
->args
, "--reference", item
->string
, NULL
);
1446 argv_array_push(&child
->args
, suc
->depth
);
1449 strbuf_reset(&displaypath_sb
);
1452 return needs_cloning
;
1455 static int update_clone_get_next_task(struct child_process
*child
,
1460 struct submodule_update_clone
*suc
= suc_cb
;
1461 const struct cache_entry
*ce
;
1464 for (; suc
->current
< suc
->list
.nr
; suc
->current
++) {
1465 ce
= suc
->list
.entries
[suc
->current
];
1466 if (prepare_to_clone_next_submodule(ce
, child
, suc
, err
)) {
1467 int *p
= xmalloc(sizeof(*p
));
1476 * The loop above tried cloning each submodule once, now try the
1477 * stragglers again, which we can imagine as an extension of the
1480 index
= suc
->current
- suc
->list
.nr
;
1481 if (index
< suc
->failed_clones_nr
) {
1483 ce
= suc
->failed_clones
[index
];
1484 if (!prepare_to_clone_next_submodule(ce
, child
, suc
, err
)) {
1486 strbuf_addstr(err
, "BUG: submodule considered for "
1487 "cloning, doesn't need cloning "
1491 p
= xmalloc(sizeof(*p
));
1501 static int update_clone_start_failure(struct strbuf
*err
,
1505 struct submodule_update_clone
*suc
= suc_cb
;
1510 static int update_clone_task_finished(int result
,
1515 const struct cache_entry
*ce
;
1516 struct submodule_update_clone
*suc
= suc_cb
;
1518 int *idxP
= idx_task_cb
;
1525 if (idx
< suc
->list
.nr
) {
1526 ce
= suc
->list
.entries
[idx
];
1527 strbuf_addf(err
, _("Failed to clone '%s'. Retry scheduled"),
1529 strbuf_addch(err
, '\n');
1530 ALLOC_GROW(suc
->failed_clones
,
1531 suc
->failed_clones_nr
+ 1,
1532 suc
->failed_clones_alloc
);
1533 suc
->failed_clones
[suc
->failed_clones_nr
++] = ce
;
1536 idx
-= suc
->list
.nr
;
1537 ce
= suc
->failed_clones
[idx
];
1538 strbuf_addf(err
, _("Failed to clone '%s' a second time, aborting"),
1540 strbuf_addch(err
, '\n');
1548 static int gitmodules_update_clone_config(const char *var
, const char *value
,
1552 if (!strcmp(var
, "submodule.fetchjobs"))
1553 *max_jobs
= parse_submodule_fetchjobs(var
, value
);
1557 static int update_clone(int argc
, const char **argv
, const char *prefix
)
1559 const char *update
= NULL
;
1561 struct string_list_item
*item
;
1562 struct pathspec pathspec
;
1563 struct submodule_update_clone suc
= SUBMODULE_UPDATE_CLONE_INIT
;
1565 struct option module_update_clone_options
[] = {
1566 OPT_STRING(0, "prefix", &prefix
,
1568 N_("path into the working tree")),
1569 OPT_STRING(0, "recursive-prefix", &suc
.recursive_prefix
,
1571 N_("path into the working tree, across nested "
1572 "submodule boundaries")),
1573 OPT_STRING(0, "update", &update
,
1575 N_("rebase, merge, checkout or none")),
1576 OPT_STRING_LIST(0, "reference", &suc
.references
, N_("repo"),
1577 N_("reference repository")),
1578 OPT_STRING(0, "depth", &suc
.depth
, "<depth>",
1579 N_("Create a shallow clone truncated to the "
1580 "specified number of revisions")),
1581 OPT_INTEGER('j', "jobs", &max_jobs
,
1582 N_("parallel jobs")),
1583 OPT_BOOL(0, "recommend-shallow", &suc
.recommend_shallow
,
1584 N_("whether the initial clone should follow the shallow recommendation")),
1585 OPT__QUIET(&suc
.quiet
, N_("don't print cloning progress")),
1586 OPT_BOOL(0, "progress", &suc
.progress
,
1587 N_("force cloning progress")),
1591 const char *const git_submodule_helper_usage
[] = {
1592 N_("git submodule--helper update_clone [--prefix=<path>] [<path>...]"),
1595 suc
.prefix
= prefix
;
1597 config_from_gitmodules(gitmodules_update_clone_config
, &max_jobs
);
1598 git_config(gitmodules_update_clone_config
, &max_jobs
);
1600 argc
= parse_options(argc
, argv
, prefix
, module_update_clone_options
,
1601 git_submodule_helper_usage
, 0);
1604 if (parse_submodule_update_strategy(update
, &suc
.update
) < 0)
1605 die(_("bad value for update parameter"));
1607 if (module_list_compute(argc
, argv
, prefix
, &pathspec
, &suc
.list
) < 0)
1611 suc
.warn_if_uninitialized
= 1;
1613 run_processes_parallel(max_jobs
,
1614 update_clone_get_next_task
,
1615 update_clone_start_failure
,
1616 update_clone_task_finished
,
1620 * We saved the output and put it out all at once now.
1622 * - the listener does not have to interleave their (checkout)
1623 * work with our fetching. The writes involved in a
1624 * checkout involve more straightforward sequential I/O.
1625 * - the listener can avoid doing any work if fetching failed.
1630 for_each_string_list_item(item
, &suc
.projectlines
)
1631 fprintf(stdout
, "%s", item
->string
);
1636 static int resolve_relative_path(int argc
, const char **argv
, const char *prefix
)
1638 struct strbuf sb
= STRBUF_INIT
;
1640 die("submodule--helper relative-path takes exactly 2 arguments, got %d", argc
);
1642 printf("%s", relative_path(argv
[1], argv
[2], &sb
));
1643 strbuf_release(&sb
);
1647 static const char *remote_submodule_branch(const char *path
)
1649 const struct submodule
*sub
;
1650 const char *branch
= NULL
;
1653 sub
= submodule_from_path(&null_oid
, path
);
1657 key
= xstrfmt("submodule.%s.branch", sub
->name
);
1658 if (repo_config_get_string_const(the_repository
, key
, &branch
))
1659 branch
= sub
->branch
;
1665 if (!strcmp(branch
, ".")) {
1666 const char *refname
= resolve_ref_unsafe("HEAD", 0, NULL
, NULL
);
1669 die(_("No such ref: %s"), "HEAD");
1672 if (!strcmp(refname
, "HEAD"))
1673 die(_("Submodule (%s) branch configured to inherit "
1674 "branch from superproject, but the superproject "
1675 "is not on any branch"), sub
->name
);
1677 if (!skip_prefix(refname
, "refs/heads/", &refname
))
1678 die(_("Expecting a full ref name, got %s"), refname
);
1685 static int resolve_remote_submodule_branch(int argc
, const char **argv
,
1689 struct strbuf sb
= STRBUF_INIT
;
1691 die("submodule--helper remote-branch takes exactly one arguments, got %d", argc
);
1693 ret
= remote_submodule_branch(argv
[1]);
1695 die("submodule %s doesn't exist", argv
[1]);
1698 strbuf_release(&sb
);
1702 static int push_check(int argc
, const char **argv
, const char *prefix
)
1704 struct remote
*remote
;
1705 const char *superproject_head
;
1707 int detached_head
= 0;
1708 struct object_id head_oid
;
1711 die("submodule--helper push-check requires at least 2 arguments");
1714 * superproject's resolved head ref.
1715 * if HEAD then the superproject is in a detached head state, otherwise
1716 * it will be the resolved head ref.
1718 superproject_head
= argv
[1];
1721 /* Get the submodule's head ref and determine if it is detached */
1722 head
= resolve_refdup("HEAD", 0, &head_oid
, NULL
);
1724 die(_("Failed to resolve HEAD as a valid ref."));
1725 if (!strcmp(head
, "HEAD"))
1729 * The remote must be configured.
1730 * This is to avoid pushing to the exact same URL as the parent.
1732 remote
= pushremote_get(argv
[1]);
1733 if (!remote
|| remote
->origin
== REMOTE_UNCONFIGURED
)
1734 die("remote '%s' not configured", argv
[1]);
1736 /* Check the refspec */
1738 int i
, refspec_nr
= argc
- 2;
1739 struct ref
*local_refs
= get_local_heads();
1740 struct refspec
*refspec
= parse_push_refspec(refspec_nr
,
1743 for (i
= 0; i
< refspec_nr
; i
++) {
1744 struct refspec
*rs
= refspec
+ i
;
1746 if (rs
->pattern
|| rs
->matching
)
1749 /* LHS must match a single ref */
1750 switch (count_refspec_match(rs
->src
, local_refs
, NULL
)) {
1755 * If LHS matches 'HEAD' then we need to ensure
1756 * that it matches the same named branch
1757 * checked out in the superproject.
1759 if (!strcmp(rs
->src
, "HEAD")) {
1760 if (!detached_head
&&
1761 !strcmp(head
, superproject_head
))
1763 die("HEAD does not match the named branch in the superproject");
1767 die("src refspec '%s' must name a ref",
1771 free_refspec(refspec_nr
, refspec
);
1778 static int absorb_git_dirs(int argc
, const char **argv
, const char *prefix
)
1781 struct pathspec pathspec
;
1782 struct module_list list
= MODULE_LIST_INIT
;
1783 unsigned flags
= ABSORB_GITDIR_RECURSE_SUBMODULES
;
1785 struct option embed_gitdir_options
[] = {
1786 OPT_STRING(0, "prefix", &prefix
,
1788 N_("path into the working tree")),
1789 OPT_BIT(0, "--recursive", &flags
, N_("recurse into submodules"),
1790 ABSORB_GITDIR_RECURSE_SUBMODULES
),
1794 const char *const git_submodule_helper_usage
[] = {
1795 N_("git submodule--helper embed-git-dir [<path>...]"),
1799 argc
= parse_options(argc
, argv
, prefix
, embed_gitdir_options
,
1800 git_submodule_helper_usage
, 0);
1802 if (module_list_compute(argc
, argv
, prefix
, &pathspec
, &list
) < 0)
1805 for (i
= 0; i
< list
.nr
; i
++)
1806 absorb_git_dir_into_superproject(prefix
,
1807 list
.entries
[i
]->name
, flags
);
1812 static int is_active(int argc
, const char **argv
, const char *prefix
)
1815 die("submodule--helper is-active takes exactly 1 argument");
1817 return !is_submodule_active(the_repository
, argv
[1]);
1820 #define SUPPORT_SUPER_PREFIX (1<<0)
1824 int (*fn
)(int, const char **, const char *);
1828 static struct cmd_struct commands
[] = {
1829 {"list", module_list
, 0},
1830 {"name", module_name
, 0},
1831 {"clone", module_clone
, 0},
1832 {"update-clone", update_clone
, 0},
1833 {"relative-path", resolve_relative_path
, 0},
1834 {"resolve-relative-url", resolve_relative_url
, 0},
1835 {"resolve-relative-url-test", resolve_relative_url_test
, 0},
1836 {"init", module_init
, SUPPORT_SUPER_PREFIX
},
1837 {"status", module_status
, SUPPORT_SUPER_PREFIX
},
1838 {"print-default-remote", print_default_remote
, 0},
1839 {"sync", module_sync
, SUPPORT_SUPER_PREFIX
},
1840 {"deinit", module_deinit
, 0},
1841 {"remote-branch", resolve_remote_submodule_branch
, 0},
1842 {"push-check", push_check
, 0},
1843 {"absorb-git-dirs", absorb_git_dirs
, SUPPORT_SUPER_PREFIX
},
1844 {"is-active", is_active
, 0},
1847 int cmd_submodule__helper(int argc
, const char **argv
, const char *prefix
)
1850 if (argc
< 2 || !strcmp(argv
[1], "-h"))
1851 usage("git submodule--helper <command>");
1853 for (i
= 0; i
< ARRAY_SIZE(commands
); i
++) {
1854 if (!strcmp(argv
[1], commands
[i
].cmd
)) {
1855 if (get_super_prefix() &&
1856 !(commands
[i
].option
& SUPPORT_SUPER_PREFIX
))
1857 die(_("%s doesn't support --super-prefix"),
1859 return commands
[i
].fn(argc
- 1, argv
+ 1, prefix
);
1863 die(_("'%s' is not a valid submodule--helper "
1864 "subcommand"), argv
[1]);