debian: new upstream release
[git/debian.git] / submodule.c
blobe603a19a876c88c59f18da33caa1541b15ded9f3
1 #include "git-compat-util.h"
2 #include "abspath.h"
3 #include "repository.h"
4 #include "config.h"
5 #include "submodule-config.h"
6 #include "submodule.h"
7 #include "dir.h"
8 #include "diff.h"
9 #include "commit.h"
10 #include "environment.h"
11 #include "gettext.h"
12 #include "hex.h"
13 #include "revision.h"
14 #include "run-command.h"
15 #include "diffcore.h"
16 #include "refs.h"
17 #include "string-list.h"
18 #include "oid-array.h"
19 #include "strvec.h"
20 #include "blob.h"
21 #include "thread-utils.h"
22 #include "path.h"
23 #include "quote.h"
24 #include "remote.h"
25 #include "worktree.h"
26 #include "parse-options.h"
27 #include "object-file.h"
28 #include "object-name.h"
29 #include "object-store-ll.h"
30 #include "commit-reach.h"
31 #include "read-cache-ll.h"
32 #include "setup.h"
33 #include "shallow.h"
34 #include "trace2.h"
36 static int config_update_recurse_submodules = RECURSE_SUBMODULES_OFF;
37 static int initialized_fetch_ref_tips;
38 static struct oid_array ref_tips_before_fetch;
39 static struct oid_array ref_tips_after_fetch;
42 * Check if the .gitmodules file is unmerged. Parsing of the .gitmodules file
43 * will be disabled because we can't guess what might be configured in
44 * .gitmodules unless the user resolves the conflict.
46 int is_gitmodules_unmerged(struct index_state *istate)
48 int pos = index_name_pos(istate, GITMODULES_FILE, strlen(GITMODULES_FILE));
49 if (pos < 0) { /* .gitmodules not found or isn't merged */
50 pos = -1 - pos;
51 if (istate->cache_nr > pos) { /* there is a .gitmodules */
52 const struct cache_entry *ce = istate->cache[pos];
53 if (ce_namelen(ce) == strlen(GITMODULES_FILE) &&
54 !strcmp(ce->name, GITMODULES_FILE))
55 return 1;
59 return 0;
63 * Check if the .gitmodules file is safe to write.
65 * Writing to the .gitmodules file requires that the file exists in the
66 * working tree or, if it doesn't, that a brand new .gitmodules file is going
67 * to be created (i.e. it's neither in the index nor in the current branch).
69 * It is not safe to write to .gitmodules if it's not in the working tree but
70 * it is in the index or in the current branch, because writing new values
71 * (and staging them) would blindly overwrite ALL the old content.
73 int is_writing_gitmodules_ok(void)
75 struct object_id oid;
76 return file_exists(GITMODULES_FILE) ||
77 (repo_get_oid(the_repository, GITMODULES_INDEX, &oid) < 0 && repo_get_oid(the_repository, GITMODULES_HEAD, &oid) < 0);
81 * Check if the .gitmodules file has unstaged modifications. This must be
82 * checked before allowing modifications to the .gitmodules file with the
83 * intention to stage them later, because when continuing we would stage the
84 * modifications the user didn't stage herself too. That might change in a
85 * future version when we learn to stage the changes we do ourselves without
86 * staging any previous modifications.
88 int is_staging_gitmodules_ok(struct index_state *istate)
90 int pos = index_name_pos(istate, GITMODULES_FILE, strlen(GITMODULES_FILE));
92 if ((pos >= 0) && (pos < istate->cache_nr)) {
93 struct stat st;
94 if (lstat(GITMODULES_FILE, &st) == 0 &&
95 ie_modified(istate, istate->cache[pos], &st, 0) & DATA_CHANGED)
96 return 0;
99 return 1;
102 static int for_each_remote_ref_submodule(const char *submodule,
103 each_ref_fn fn, void *cb_data)
105 return refs_for_each_remote_ref(get_submodule_ref_store(submodule),
106 fn, cb_data);
110 * Try to update the "path" entry in the "submodule.<name>" section of the
111 * .gitmodules file. Return 0 only if a .gitmodules file was found, a section
112 * with the correct path=<oldpath> setting was found and we could update it.
114 int update_path_in_gitmodules(const char *oldpath, const char *newpath)
116 struct strbuf entry = STRBUF_INIT;
117 const struct submodule *submodule;
118 int ret;
120 if (!file_exists(GITMODULES_FILE)) /* Do nothing without .gitmodules */
121 return -1;
123 if (is_gitmodules_unmerged(the_repository->index))
124 die(_("Cannot change unmerged .gitmodules, resolve merge conflicts first"));
126 submodule = submodule_from_path(the_repository, null_oid(), oldpath);
127 if (!submodule || !submodule->name) {
128 warning(_("Could not find section in .gitmodules where path=%s"), oldpath);
129 return -1;
131 strbuf_addstr(&entry, "submodule.");
132 strbuf_addstr(&entry, submodule->name);
133 strbuf_addstr(&entry, ".path");
134 ret = config_set_in_gitmodules_file_gently(entry.buf, newpath);
135 strbuf_release(&entry);
136 return ret;
140 * Try to remove the "submodule.<name>" section from .gitmodules where the given
141 * path is configured. Return 0 only if a .gitmodules file was found, a section
142 * with the correct path=<path> setting was found and we could remove it.
144 int remove_path_from_gitmodules(const char *path)
146 struct strbuf sect = STRBUF_INIT;
147 const struct submodule *submodule;
149 if (!file_exists(GITMODULES_FILE)) /* Do nothing without .gitmodules */
150 return -1;
152 if (is_gitmodules_unmerged(the_repository->index))
153 die(_("Cannot change unmerged .gitmodules, resolve merge conflicts first"));
155 submodule = submodule_from_path(the_repository, null_oid(), path);
156 if (!submodule || !submodule->name) {
157 warning(_("Could not find section in .gitmodules where path=%s"), path);
158 return -1;
160 strbuf_addstr(&sect, "submodule.");
161 strbuf_addstr(&sect, submodule->name);
162 if (git_config_rename_section_in_file(GITMODULES_FILE, sect.buf, NULL) < 0) {
163 /* Maybe the user already did that, don't error out here */
164 warning(_("Could not remove .gitmodules entry for %s"), path);
165 strbuf_release(&sect);
166 return -1;
168 strbuf_release(&sect);
169 return 0;
172 void stage_updated_gitmodules(struct index_state *istate)
174 if (add_file_to_index(istate, GITMODULES_FILE, 0))
175 die(_("staging updated .gitmodules failed"));
178 static struct string_list added_submodule_odb_paths = STRING_LIST_INIT_NODUP;
180 void add_submodule_odb_by_path(const char *path)
182 string_list_insert(&added_submodule_odb_paths, xstrdup(path));
185 int register_all_submodule_odb_as_alternates(void)
187 int i;
188 int ret = added_submodule_odb_paths.nr;
190 for (i = 0; i < added_submodule_odb_paths.nr; i++)
191 add_to_alternates_memory(added_submodule_odb_paths.items[i].string);
192 if (ret) {
193 string_list_clear(&added_submodule_odb_paths, 0);
194 trace2_data_intmax("submodule", the_repository,
195 "register_all_submodule_odb_as_alternates/registered", ret);
196 if (git_env_bool("GIT_TEST_FATAL_REGISTER_SUBMODULE_ODB", 0))
197 BUG("register_all_submodule_odb_as_alternates() called");
199 return ret;
202 void set_diffopt_flags_from_submodule_config(struct diff_options *diffopt,
203 const char *path)
205 const struct submodule *submodule = submodule_from_path(the_repository,
206 null_oid(),
207 path);
208 if (submodule) {
209 const char *ignore;
210 char *key;
212 key = xstrfmt("submodule.%s.ignore", submodule->name);
213 if (repo_config_get_string_tmp(the_repository, key, &ignore))
214 ignore = submodule->ignore;
215 free(key);
217 if (ignore)
218 handle_ignore_submodules_arg(diffopt, ignore);
219 else if (is_gitmodules_unmerged(the_repository->index))
220 diffopt->flags.ignore_submodules = 1;
224 /* Cheap function that only determines if we're interested in submodules at all */
225 int git_default_submodule_config(const char *var, const char *value,
226 void *cb UNUSED)
228 if (!strcmp(var, "submodule.recurse")) {
229 int v = git_config_bool(var, value) ?
230 RECURSE_SUBMODULES_ON : RECURSE_SUBMODULES_OFF;
231 config_update_recurse_submodules = v;
233 return 0;
236 int option_parse_recurse_submodules_worktree_updater(const struct option *opt,
237 const char *arg, int unset)
239 if (unset) {
240 config_update_recurse_submodules = RECURSE_SUBMODULES_OFF;
241 return 0;
243 if (arg)
244 config_update_recurse_submodules =
245 parse_update_recurse_submodules_arg(opt->long_name,
246 arg);
247 else
248 config_update_recurse_submodules = RECURSE_SUBMODULES_ON;
250 return 0;
254 * Determine if a submodule has been initialized at a given 'path'
257 * NEEDSWORK: Emit a warning if submodule.active exists, but is valueless,
258 * ie, the config looks like: "[submodule] active\n".
259 * Since that is an invalid pathspec, we should inform the user.
261 int is_tree_submodule_active(struct repository *repo,
262 const struct object_id *treeish_name,
263 const char *path)
265 int ret = 0;
266 char *key = NULL;
267 char *value = NULL;
268 const struct string_list *sl;
269 const struct submodule *module;
271 module = submodule_from_path(repo, treeish_name, path);
273 /* early return if there isn't a path->module mapping */
274 if (!module)
275 return 0;
277 /* submodule.<name>.active is set */
278 key = xstrfmt("submodule.%s.active", module->name);
279 if (!repo_config_get_bool(repo, key, &ret)) {
280 free(key);
281 return ret;
283 free(key);
285 /* submodule.active is set */
286 if (!repo_config_get_string_multi(repo, "submodule.active", &sl)) {
287 struct pathspec ps;
288 struct strvec args = STRVEC_INIT;
289 const struct string_list_item *item;
291 for_each_string_list_item(item, sl) {
292 strvec_push(&args, item->string);
295 parse_pathspec(&ps, 0, 0, NULL, args.v);
296 ret = match_pathspec(repo->index, &ps, path, strlen(path), 0, NULL, 1);
298 strvec_clear(&args);
299 clear_pathspec(&ps);
300 return ret;
303 /* fallback to checking if the URL is set */
304 key = xstrfmt("submodule.%s.url", module->name);
305 ret = !repo_config_get_string(repo, key, &value);
307 free(value);
308 free(key);
309 return ret;
312 int is_submodule_active(struct repository *repo, const char *path)
314 return is_tree_submodule_active(repo, null_oid(), path);
317 int is_submodule_populated_gently(const char *path, int *return_error_code)
319 int ret = 0;
320 char *gitdir = xstrfmt("%s/.git", path);
322 if (resolve_gitdir_gently(gitdir, return_error_code))
323 ret = 1;
325 free(gitdir);
326 return ret;
330 * Dies if the provided 'prefix' corresponds to an unpopulated submodule
332 void die_in_unpopulated_submodule(struct index_state *istate,
333 const char *prefix)
335 int i, prefixlen;
337 if (!prefix)
338 return;
340 prefixlen = strlen(prefix);
342 for (i = 0; i < istate->cache_nr; i++) {
343 struct cache_entry *ce = istate->cache[i];
344 int ce_len = ce_namelen(ce);
346 if (!S_ISGITLINK(ce->ce_mode))
347 continue;
348 if (prefixlen <= ce_len)
349 continue;
350 if (strncmp(ce->name, prefix, ce_len))
351 continue;
352 if (prefix[ce_len] != '/')
353 continue;
355 die(_("in unpopulated submodule '%s'"), ce->name);
360 * Dies if any paths in the provided pathspec descends into a submodule
362 void die_path_inside_submodule(struct index_state *istate,
363 const struct pathspec *ps)
365 int i, j;
367 for (i = 0; i < istate->cache_nr; i++) {
368 struct cache_entry *ce = istate->cache[i];
369 int ce_len = ce_namelen(ce);
371 if (!S_ISGITLINK(ce->ce_mode))
372 continue;
374 for (j = 0; j < ps->nr ; j++) {
375 const struct pathspec_item *item = &ps->items[j];
377 if (item->len <= ce_len)
378 continue;
379 if (item->match[ce_len] != '/')
380 continue;
381 if (strncmp(ce->name, item->match, ce_len))
382 continue;
383 if (item->len == ce_len + 1)
384 continue;
386 die(_("Pathspec '%s' is in submodule '%.*s'"),
387 item->original, ce_len, ce->name);
392 enum submodule_update_type parse_submodule_update_type(const char *value)
394 if (!strcmp(value, "none"))
395 return SM_UPDATE_NONE;
396 else if (!strcmp(value, "checkout"))
397 return SM_UPDATE_CHECKOUT;
398 else if (!strcmp(value, "rebase"))
399 return SM_UPDATE_REBASE;
400 else if (!strcmp(value, "merge"))
401 return SM_UPDATE_MERGE;
402 else if (*value == '!')
403 return SM_UPDATE_COMMAND;
404 else
405 return SM_UPDATE_UNSPECIFIED;
408 int parse_submodule_update_strategy(const char *value,
409 struct submodule_update_strategy *dst)
411 enum submodule_update_type type;
413 free((void*)dst->command);
414 dst->command = NULL;
416 type = parse_submodule_update_type(value);
417 if (type == SM_UPDATE_UNSPECIFIED)
418 return -1;
420 dst->type = type;
421 if (type == SM_UPDATE_COMMAND)
422 dst->command = xstrdup(value + 1);
424 return 0;
427 const char *submodule_update_type_to_string(enum submodule_update_type type)
429 switch (type) {
430 case SM_UPDATE_CHECKOUT:
431 return "checkout";
432 case SM_UPDATE_MERGE:
433 return "merge";
434 case SM_UPDATE_REBASE:
435 return "rebase";
436 case SM_UPDATE_NONE:
437 return "none";
438 case SM_UPDATE_UNSPECIFIED:
439 case SM_UPDATE_COMMAND:
440 BUG("init_submodule() should handle type %d", type);
441 default:
442 BUG("unexpected update strategy type: %d", type);
446 void handle_ignore_submodules_arg(struct diff_options *diffopt,
447 const char *arg)
449 diffopt->flags.ignore_submodule_set = 1;
450 diffopt->flags.ignore_submodules = 0;
451 diffopt->flags.ignore_untracked_in_submodules = 0;
452 diffopt->flags.ignore_dirty_submodules = 0;
454 if (!strcmp(arg, "all"))
455 diffopt->flags.ignore_submodules = 1;
456 else if (!strcmp(arg, "untracked"))
457 diffopt->flags.ignore_untracked_in_submodules = 1;
458 else if (!strcmp(arg, "dirty"))
459 diffopt->flags.ignore_dirty_submodules = 1;
460 else if (strcmp(arg, "none"))
461 die(_("bad --ignore-submodules argument: %s"), arg);
463 * Please update _git_status() in git-completion.bash when you
464 * add new options
468 static int prepare_submodule_diff_summary(struct repository *r, struct rev_info *rev,
469 const char *path,
470 struct commit *left, struct commit *right,
471 struct commit_list *merge_bases)
473 struct commit_list *list;
475 repo_init_revisions(r, rev, NULL);
476 setup_revisions(0, NULL, rev, NULL);
477 rev->left_right = 1;
478 rev->first_parent_only = 1;
479 left->object.flags |= SYMMETRIC_LEFT;
480 add_pending_object(rev, &left->object, path);
481 add_pending_object(rev, &right->object, path);
482 for (list = merge_bases; list; list = list->next) {
483 list->item->object.flags |= UNINTERESTING;
484 add_pending_object(rev, &list->item->object,
485 oid_to_hex(&list->item->object.oid));
487 return prepare_revision_walk(rev);
490 static void print_submodule_diff_summary(struct repository *r, struct rev_info *rev, struct diff_options *o)
492 static const char format[] = " %m %s";
493 struct strbuf sb = STRBUF_INIT;
494 struct commit *commit;
496 while ((commit = get_revision(rev))) {
497 struct pretty_print_context ctx = {0};
498 ctx.date_mode = rev->date_mode;
499 ctx.output_encoding = get_log_output_encoding();
500 strbuf_setlen(&sb, 0);
501 repo_format_commit_message(r, commit, format, &sb,
502 &ctx);
503 strbuf_addch(&sb, '\n');
504 if (commit->object.flags & SYMMETRIC_LEFT)
505 diff_emit_submodule_del(o, sb.buf);
506 else
507 diff_emit_submodule_add(o, sb.buf);
509 strbuf_release(&sb);
512 void prepare_submodule_repo_env(struct strvec *out)
514 prepare_other_repo_env(out, DEFAULT_GIT_DIR_ENVIRONMENT);
517 static void prepare_submodule_repo_env_in_gitdir(struct strvec *out)
519 prepare_other_repo_env(out, ".");
523 * Initialize a repository struct for a submodule based on the provided 'path'.
525 * Returns the repository struct on success,
526 * NULL when the submodule is not present.
528 static struct repository *open_submodule(const char *path)
530 struct strbuf sb = STRBUF_INIT;
531 struct repository *out = xmalloc(sizeof(*out));
533 if (submodule_to_gitdir(&sb, path) || repo_init(out, sb.buf, NULL)) {
534 strbuf_release(&sb);
535 free(out);
536 return NULL;
539 /* Mark it as a submodule */
540 out->submodule_prefix = xstrdup(path);
542 strbuf_release(&sb);
543 return out;
547 * Helper function to display the submodule header line prior to the full
548 * summary output.
550 * If it can locate the submodule git directory it will create a repository
551 * handle for the submodule and lookup both the left and right commits and
552 * put them into the left and right pointers.
554 static void show_submodule_header(struct diff_options *o,
555 const char *path,
556 struct object_id *one, struct object_id *two,
557 unsigned dirty_submodule,
558 struct repository *sub,
559 struct commit **left, struct commit **right,
560 struct commit_list **merge_bases)
562 const char *message = NULL;
563 struct strbuf sb = STRBUF_INIT;
564 int fast_forward = 0, fast_backward = 0;
566 if (dirty_submodule & DIRTY_SUBMODULE_UNTRACKED)
567 diff_emit_submodule_untracked(o, path);
569 if (dirty_submodule & DIRTY_SUBMODULE_MODIFIED)
570 diff_emit_submodule_modified(o, path);
572 if (is_null_oid(one))
573 message = "(new submodule)";
574 else if (is_null_oid(two))
575 message = "(submodule deleted)";
577 if (!sub) {
578 if (!message)
579 message = "(commits not present)";
580 goto output_header;
584 * Attempt to lookup the commit references, and determine if this is
585 * a fast forward or fast backwards update.
587 *left = lookup_commit_reference(sub, one);
588 *right = lookup_commit_reference(sub, two);
591 * Warn about missing commits in the submodule project, but only if
592 * they aren't null.
594 if ((!is_null_oid(one) && !*left) ||
595 (!is_null_oid(two) && !*right))
596 message = "(commits not present)";
598 *merge_bases = repo_get_merge_bases(sub, *left, *right);
599 if (*merge_bases) {
600 if ((*merge_bases)->item == *left)
601 fast_forward = 1;
602 else if ((*merge_bases)->item == *right)
603 fast_backward = 1;
606 if (oideq(one, two)) {
607 strbuf_release(&sb);
608 return;
611 output_header:
612 strbuf_addf(&sb, "Submodule %s ", path);
613 strbuf_add_unique_abbrev(&sb, one, DEFAULT_ABBREV);
614 strbuf_addstr(&sb, (fast_backward || fast_forward) ? ".." : "...");
615 strbuf_add_unique_abbrev(&sb, two, DEFAULT_ABBREV);
616 if (message)
617 strbuf_addf(&sb, " %s\n", message);
618 else
619 strbuf_addf(&sb, "%s:\n", fast_backward ? " (rewind)" : "");
620 diff_emit_submodule_header(o, sb.buf);
622 strbuf_release(&sb);
625 void show_submodule_diff_summary(struct diff_options *o, const char *path,
626 struct object_id *one, struct object_id *two,
627 unsigned dirty_submodule)
629 struct rev_info rev = REV_INFO_INIT;
630 struct commit *left = NULL, *right = NULL;
631 struct commit_list *merge_bases = NULL;
632 struct repository *sub;
634 sub = open_submodule(path);
635 show_submodule_header(o, path, one, two, dirty_submodule,
636 sub, &left, &right, &merge_bases);
639 * If we don't have both a left and a right pointer, there is no
640 * reason to try and display a summary. The header line should contain
641 * all the information the user needs.
643 if (!left || !right || !sub)
644 goto out;
646 /* Treat revision walker failure the same as missing commits */
647 if (prepare_submodule_diff_summary(sub, &rev, path, left, right, merge_bases)) {
648 diff_emit_submodule_error(o, "(revision walker failed)\n");
649 goto out;
652 print_submodule_diff_summary(sub, &rev, o);
654 out:
655 free_commit_list(merge_bases);
656 release_revisions(&rev);
657 clear_commit_marks(left, ~0);
658 clear_commit_marks(right, ~0);
659 if (sub) {
660 repo_clear(sub);
661 free(sub);
665 void show_submodule_inline_diff(struct diff_options *o, const char *path,
666 struct object_id *one, struct object_id *two,
667 unsigned dirty_submodule)
669 const struct object_id *old_oid = the_hash_algo->empty_tree, *new_oid = the_hash_algo->empty_tree;
670 struct commit *left = NULL, *right = NULL;
671 struct commit_list *merge_bases = NULL;
672 struct child_process cp = CHILD_PROCESS_INIT;
673 struct strbuf sb = STRBUF_INIT;
674 struct repository *sub;
676 sub = open_submodule(path);
677 show_submodule_header(o, path, one, two, dirty_submodule,
678 sub, &left, &right, &merge_bases);
680 /* We need a valid left and right commit to display a difference */
681 if (!(left || is_null_oid(one)) ||
682 !(right || is_null_oid(two)))
683 goto done;
685 if (left)
686 old_oid = one;
687 if (right)
688 new_oid = two;
690 cp.git_cmd = 1;
691 cp.dir = path;
692 cp.out = -1;
693 cp.no_stdin = 1;
695 /* TODO: other options may need to be passed here. */
696 strvec_pushl(&cp.args, "diff", "--submodule=diff", NULL);
697 strvec_pushf(&cp.args, "--color=%s", want_color(o->use_color) ?
698 "always" : "never");
700 if (o->flags.reverse_diff) {
701 strvec_pushf(&cp.args, "--src-prefix=%s%s/",
702 o->b_prefix, path);
703 strvec_pushf(&cp.args, "--dst-prefix=%s%s/",
704 o->a_prefix, path);
705 } else {
706 strvec_pushf(&cp.args, "--src-prefix=%s%s/",
707 o->a_prefix, path);
708 strvec_pushf(&cp.args, "--dst-prefix=%s%s/",
709 o->b_prefix, path);
711 strvec_push(&cp.args, oid_to_hex(old_oid));
713 * If the submodule has modified content, we will diff against the
714 * work tree, under the assumption that the user has asked for the
715 * diff format and wishes to actually see all differences even if they
716 * haven't yet been committed to the submodule yet.
718 if (!(dirty_submodule & DIRTY_SUBMODULE_MODIFIED))
719 strvec_push(&cp.args, oid_to_hex(new_oid));
721 prepare_submodule_repo_env(&cp.env);
723 if (!is_directory(path)) {
724 /* fall back to absorbed git dir, if any */
725 if (!sub)
726 goto done;
727 cp.dir = sub->gitdir;
728 strvec_push(&cp.env, GIT_DIR_ENVIRONMENT "=.");
729 strvec_push(&cp.env, GIT_WORK_TREE_ENVIRONMENT "=.");
732 if (start_command(&cp)) {
733 diff_emit_submodule_error(o, "(diff failed)\n");
734 goto done;
737 while (strbuf_getwholeline_fd(&sb, cp.out, '\n') != EOF)
738 diff_emit_submodule_pipethrough(o, sb.buf, sb.len);
740 if (finish_command(&cp))
741 diff_emit_submodule_error(o, "(diff failed)\n");
743 done:
744 strbuf_release(&sb);
745 free_commit_list(merge_bases);
746 if (left)
747 clear_commit_marks(left, ~0);
748 if (right)
749 clear_commit_marks(right, ~0);
750 if (sub) {
751 repo_clear(sub);
752 free(sub);
756 int should_update_submodules(void)
758 return config_update_recurse_submodules == RECURSE_SUBMODULES_ON;
761 const struct submodule *submodule_from_ce(const struct cache_entry *ce)
763 if (!S_ISGITLINK(ce->ce_mode))
764 return NULL;
766 if (!should_update_submodules())
767 return NULL;
769 return submodule_from_path(the_repository, null_oid(), ce->name);
773 struct collect_changed_submodules_cb_data {
774 struct repository *repo;
775 struct string_list *changed;
776 const struct object_id *commit_oid;
780 * this would normally be two functions: default_name_from_path() and
781 * path_from_default_name(). Since the default name is the same as
782 * the submodule path we can get away with just one function which only
783 * checks whether there is a submodule in the working directory at that
784 * location.
786 static const char *default_name_or_path(const char *path_or_name)
788 int error_code;
790 if (!is_submodule_populated_gently(path_or_name, &error_code))
791 return NULL;
793 return path_or_name;
797 * Holds relevant information for a changed submodule. Used as the .util
798 * member of the changed submodule name string_list_item.
800 * (super_oid, path) allows the submodule config to be read from _some_
801 * .gitmodules file. We store this information the first time we find a
802 * superproject commit that points to the submodule, but this is
803 * arbitrary - we can choose any (super_oid, path) that matches the
804 * submodule's name.
806 * NEEDSWORK: Storing an arbitrary commit is undesirable because we can't
807 * guarantee that we're reading the commit that the user would expect. A better
808 * scheme would be to just fetch a submodule by its name. This requires two
809 * steps:
810 * - Create a function that behaves like repo_submodule_init(), but accepts a
811 * submodule name instead of treeish_name and path. This should be easy
812 * because repo_submodule_init() internally uses the submodule's name.
814 * - Replace most instances of 'struct submodule' (which is the .gitmodules
815 * config) with just the submodule name. This is OK because we expect
816 * submodule settings to be stored in .git/config (via "git submodule init"),
817 * not .gitmodules. This also lets us delete get_non_gitmodules_submodule(),
818 * which constructs a bogus 'struct submodule' for the sake of giving a
819 * placeholder name to a gitlink.
821 struct changed_submodule_data {
823 * The first superproject commit in the rev walk that points to
824 * the submodule.
826 const struct object_id *super_oid;
828 * Path to the submodule in the superproject commit referenced
829 * by 'super_oid'.
831 char *path;
832 /* The submodule commits that have changed in the rev walk. */
833 struct oid_array new_commits;
836 static void changed_submodule_data_clear(struct changed_submodule_data *cs_data)
838 oid_array_clear(&cs_data->new_commits);
839 free(cs_data->path);
842 static void collect_changed_submodules_cb(struct diff_queue_struct *q,
843 struct diff_options *options UNUSED,
844 void *data)
846 struct collect_changed_submodules_cb_data *me = data;
847 struct string_list *changed = me->changed;
848 const struct object_id *commit_oid = me->commit_oid;
849 int i;
851 for (i = 0; i < q->nr; i++) {
852 struct diff_filepair *p = q->queue[i];
853 const struct submodule *submodule;
854 const char *name;
855 struct string_list_item *item;
856 struct changed_submodule_data *cs_data;
858 if (!S_ISGITLINK(p->two->mode))
859 continue;
861 submodule = submodule_from_path(me->repo,
862 commit_oid, p->two->path);
863 if (submodule)
864 name = submodule->name;
865 else {
866 name = default_name_or_path(p->two->path);
867 /* make sure name does not collide with existing one */
868 if (name)
869 submodule = submodule_from_name(me->repo,
870 commit_oid, name);
871 if (submodule) {
872 warning(_("Submodule in commit %s at path: "
873 "'%s' collides with a submodule named "
874 "the same. Skipping it."),
875 oid_to_hex(commit_oid), p->two->path);
876 name = NULL;
880 if (!name)
881 continue;
883 item = string_list_insert(changed, name);
884 if (item->util)
885 cs_data = item->util;
886 else {
887 item->util = xcalloc(1, sizeof(struct changed_submodule_data));
888 cs_data = item->util;
889 cs_data->super_oid = commit_oid;
890 cs_data->path = xstrdup(p->two->path);
892 oid_array_append(&cs_data->new_commits, &p->two->oid);
897 * Collect the paths of submodules in 'changed' which have changed based on
898 * the revisions as specified in 'argv'. Each entry in 'changed' will also
899 * have a corresponding 'struct oid_array' (in the 'util' field) which lists
900 * what the submodule pointers were updated to during the change.
902 static void collect_changed_submodules(struct repository *r,
903 struct string_list *changed,
904 struct strvec *argv)
906 struct rev_info rev;
907 const struct commit *commit;
908 int save_warning;
909 struct setup_revision_opt s_r_opt = {
910 .assume_dashdash = 1,
913 save_warning = warn_on_object_refname_ambiguity;
914 warn_on_object_refname_ambiguity = 0;
915 repo_init_revisions(r, &rev, NULL);
916 setup_revisions(argv->nr, argv->v, &rev, &s_r_opt);
917 warn_on_object_refname_ambiguity = save_warning;
918 if (prepare_revision_walk(&rev))
919 die(_("revision walk setup failed"));
921 while ((commit = get_revision(&rev))) {
922 struct rev_info diff_rev;
923 struct collect_changed_submodules_cb_data data;
924 data.repo = r;
925 data.changed = changed;
926 data.commit_oid = &commit->object.oid;
928 repo_init_revisions(r, &diff_rev, NULL);
929 diff_rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
930 diff_rev.diffopt.format_callback = collect_changed_submodules_cb;
931 diff_rev.diffopt.format_callback_data = &data;
932 diff_rev.dense_combined_merges = 1;
933 diff_tree_combined_merge(commit, &diff_rev);
934 release_revisions(&diff_rev);
937 reset_revision_walk();
938 release_revisions(&rev);
941 static void free_submodules_data(struct string_list *submodules)
943 struct string_list_item *item;
944 for_each_string_list_item(item, submodules)
945 changed_submodule_data_clear(item->util);
947 string_list_clear(submodules, 1);
950 static int has_remote(const char *refname UNUSED,
951 const struct object_id *oid UNUSED,
952 int flags UNUSED, void *cb_data UNUSED)
954 return 1;
957 static int append_oid_to_argv(const struct object_id *oid, void *data)
959 struct strvec *argv = data;
960 strvec_push(argv, oid_to_hex(oid));
961 return 0;
964 struct has_commit_data {
965 struct repository *repo;
966 int result;
967 const char *path;
968 const struct object_id *super_oid;
971 static int check_has_commit(const struct object_id *oid, void *data)
973 struct has_commit_data *cb = data;
974 struct repository subrepo;
975 enum object_type type;
977 if (repo_submodule_init(&subrepo, cb->repo, cb->path, cb->super_oid)) {
978 cb->result = 0;
979 /* subrepo failed to init, so don't clean it up. */
980 return 0;
983 type = oid_object_info(&subrepo, oid, NULL);
985 switch (type) {
986 case OBJ_COMMIT:
987 goto cleanup;
988 case OBJ_BAD:
990 * Object is missing or invalid. If invalid, an error message
991 * has already been printed.
993 cb->result = 0;
994 goto cleanup;
995 default:
996 die(_("submodule entry '%s' (%s) is a %s, not a commit"),
997 cb->path, oid_to_hex(oid), type_name(type));
999 cleanup:
1000 repo_clear(&subrepo);
1001 return 0;
1004 static int submodule_has_commits(struct repository *r,
1005 const char *path,
1006 const struct object_id *super_oid,
1007 struct oid_array *commits)
1009 struct has_commit_data has_commit = {
1010 .repo = r,
1011 .result = 1,
1012 .path = path,
1013 .super_oid = super_oid
1016 oid_array_for_each_unique(commits, check_has_commit, &has_commit);
1018 if (has_commit.result) {
1020 * Even if the submodule is checked out and the commit is
1021 * present, make sure it exists in the submodule's object store
1022 * and that it is reachable from a ref.
1024 struct child_process cp = CHILD_PROCESS_INIT;
1025 struct strbuf out = STRBUF_INIT;
1027 strvec_pushl(&cp.args, "rev-list", "-n", "1", NULL);
1028 oid_array_for_each_unique(commits, append_oid_to_argv, &cp.args);
1029 strvec_pushl(&cp.args, "--not", "--all", NULL);
1031 prepare_submodule_repo_env(&cp.env);
1032 cp.git_cmd = 1;
1033 cp.no_stdin = 1;
1034 cp.dir = path;
1036 if (capture_command(&cp, &out, GIT_MAX_HEXSZ + 1) || out.len)
1037 has_commit.result = 0;
1039 strbuf_release(&out);
1042 return has_commit.result;
1045 static int submodule_needs_pushing(struct repository *r,
1046 const char *path,
1047 struct oid_array *commits)
1049 if (!submodule_has_commits(r, path, null_oid(), commits))
1051 * NOTE: We do consider it safe to return "no" here. The
1052 * correct answer would be "We do not know" instead of
1053 * "No push needed", but it is quite hard to change
1054 * the submodule pointer without having the submodule
1055 * around. If a user did however change the submodules
1056 * without having the submodule around, this indicates
1057 * an expert who knows what they are doing or a
1058 * maintainer integrating work from other people. In
1059 * both cases it should be safe to skip this check.
1061 return 0;
1063 if (for_each_remote_ref_submodule(path, has_remote, NULL) > 0) {
1064 struct child_process cp = CHILD_PROCESS_INIT;
1065 struct strbuf buf = STRBUF_INIT;
1066 int needs_pushing = 0;
1068 strvec_push(&cp.args, "rev-list");
1069 oid_array_for_each_unique(commits, append_oid_to_argv, &cp.args);
1070 strvec_pushl(&cp.args, "--not", "--remotes", "-n", "1" , NULL);
1072 prepare_submodule_repo_env(&cp.env);
1073 cp.git_cmd = 1;
1074 cp.no_stdin = 1;
1075 cp.out = -1;
1076 cp.dir = path;
1077 if (start_command(&cp))
1078 die(_("Could not run 'git rev-list <commits> --not --remotes -n 1' command in submodule %s"),
1079 path);
1080 if (strbuf_read(&buf, cp.out, the_hash_algo->hexsz + 1))
1081 needs_pushing = 1;
1082 finish_command(&cp);
1083 close(cp.out);
1084 strbuf_release(&buf);
1085 return needs_pushing;
1088 return 0;
1091 int find_unpushed_submodules(struct repository *r,
1092 struct oid_array *commits,
1093 const char *remotes_name,
1094 struct string_list *needs_pushing)
1096 struct string_list submodules = STRING_LIST_INIT_DUP;
1097 struct string_list_item *name;
1098 struct strvec argv = STRVEC_INIT;
1100 /* argv.v[0] will be ignored by setup_revisions */
1101 strvec_push(&argv, "find_unpushed_submodules");
1102 oid_array_for_each_unique(commits, append_oid_to_argv, &argv);
1103 strvec_push(&argv, "--not");
1104 strvec_pushf(&argv, "--remotes=%s", remotes_name);
1106 collect_changed_submodules(r, &submodules, &argv);
1108 for_each_string_list_item(name, &submodules) {
1109 struct changed_submodule_data *cs_data = name->util;
1110 const struct submodule *submodule;
1111 const char *path = NULL;
1113 submodule = submodule_from_name(r, null_oid(), name->string);
1114 if (submodule)
1115 path = submodule->path;
1116 else
1117 path = default_name_or_path(name->string);
1119 if (!path)
1120 continue;
1122 if (submodule_needs_pushing(r, path, &cs_data->new_commits))
1123 string_list_insert(needs_pushing, path);
1126 free_submodules_data(&submodules);
1127 strvec_clear(&argv);
1129 return needs_pushing->nr;
1132 static int push_submodule(const char *path,
1133 const struct remote *remote,
1134 const struct refspec *rs,
1135 const struct string_list *push_options,
1136 int dry_run)
1138 if (for_each_remote_ref_submodule(path, has_remote, NULL) > 0) {
1139 struct child_process cp = CHILD_PROCESS_INIT;
1140 strvec_push(&cp.args, "push");
1142 * When recursing into a submodule, treat any "only" configurations as "on-
1143 * demand", since "only" would not work (we need all submodules to be pushed
1144 * in order to be able to push the superproject).
1146 strvec_push(&cp.args, "--recurse-submodules=only-is-on-demand");
1147 if (dry_run)
1148 strvec_push(&cp.args, "--dry-run");
1150 if (push_options && push_options->nr) {
1151 const struct string_list_item *item;
1152 for_each_string_list_item(item, push_options)
1153 strvec_pushf(&cp.args, "--push-option=%s",
1154 item->string);
1157 if (remote->origin != REMOTE_UNCONFIGURED) {
1158 int i;
1159 strvec_push(&cp.args, remote->name);
1160 for (i = 0; i < rs->raw_nr; i++)
1161 strvec_push(&cp.args, rs->raw[i]);
1164 prepare_submodule_repo_env(&cp.env);
1165 cp.git_cmd = 1;
1166 cp.no_stdin = 1;
1167 cp.dir = path;
1168 if (run_command(&cp))
1169 return 0;
1170 close(cp.out);
1173 return 1;
1177 * Perform a check in the submodule to see if the remote and refspec work.
1178 * Die if the submodule can't be pushed.
1180 static void submodule_push_check(const char *path, const char *head,
1181 const struct remote *remote,
1182 const struct refspec *rs)
1184 struct child_process cp = CHILD_PROCESS_INIT;
1185 int i;
1187 strvec_push(&cp.args, "submodule--helper");
1188 strvec_push(&cp.args, "push-check");
1189 strvec_push(&cp.args, head);
1190 strvec_push(&cp.args, remote->name);
1192 for (i = 0; i < rs->raw_nr; i++)
1193 strvec_push(&cp.args, rs->raw[i]);
1195 prepare_submodule_repo_env(&cp.env);
1196 cp.git_cmd = 1;
1197 cp.no_stdin = 1;
1198 cp.no_stdout = 1;
1199 cp.dir = path;
1202 * Simply indicate if 'submodule--helper push-check' failed.
1203 * More detailed error information will be provided by the
1204 * child process.
1206 if (run_command(&cp))
1207 die(_("process for submodule '%s' failed"), path);
1210 int push_unpushed_submodules(struct repository *r,
1211 struct oid_array *commits,
1212 const struct remote *remote,
1213 const struct refspec *rs,
1214 const struct string_list *push_options,
1215 int dry_run)
1217 int i, ret = 1;
1218 struct string_list needs_pushing = STRING_LIST_INIT_DUP;
1220 if (!find_unpushed_submodules(r, commits,
1221 remote->name, &needs_pushing))
1222 return 1;
1225 * Verify that the remote and refspec can be propagated to all
1226 * submodules. This check can be skipped if the remote and refspec
1227 * won't be propagated due to the remote being unconfigured (e.g. a URL
1228 * instead of a remote name).
1230 if (remote->origin != REMOTE_UNCONFIGURED) {
1231 char *head;
1232 struct object_id head_oid;
1234 head = resolve_refdup("HEAD", 0, &head_oid, NULL);
1235 if (!head)
1236 die(_("Failed to resolve HEAD as a valid ref."));
1238 for (i = 0; i < needs_pushing.nr; i++)
1239 submodule_push_check(needs_pushing.items[i].string,
1240 head, remote, rs);
1241 free(head);
1244 /* Actually push the submodules */
1245 for (i = 0; i < needs_pushing.nr; i++) {
1246 const char *path = needs_pushing.items[i].string;
1247 fprintf(stderr, _("Pushing submodule '%s'\n"), path);
1248 if (!push_submodule(path, remote, rs,
1249 push_options, dry_run)) {
1250 fprintf(stderr, _("Unable to push submodule '%s'\n"), path);
1251 ret = 0;
1255 string_list_clear(&needs_pushing, 0);
1257 return ret;
1260 static int append_oid_to_array(const char *ref UNUSED,
1261 const struct object_id *oid,
1262 int flags UNUSED, void *data)
1264 struct oid_array *array = data;
1265 oid_array_append(array, oid);
1266 return 0;
1269 void check_for_new_submodule_commits(struct object_id *oid)
1271 if (!initialized_fetch_ref_tips) {
1272 for_each_ref(append_oid_to_array, &ref_tips_before_fetch);
1273 initialized_fetch_ref_tips = 1;
1276 oid_array_append(&ref_tips_after_fetch, oid);
1280 * Returns 1 if there is at least one submodule gitdir in
1281 * $GIT_DIR/modules and 0 otherwise. This follows
1282 * submodule_name_to_gitdir(), which looks for submodules in
1283 * $GIT_DIR/modules, not $GIT_COMMON_DIR.
1285 * A submodule can be moved to $GIT_DIR/modules manually by running "git
1286 * submodule absorbgitdirs", or it may be initialized there by "git
1287 * submodule update".
1289 static int repo_has_absorbed_submodules(struct repository *r)
1291 int ret;
1292 struct strbuf buf = STRBUF_INIT;
1294 strbuf_repo_git_path(&buf, r, "modules/");
1295 ret = file_exists(buf.buf) && !is_empty_dir(buf.buf);
1296 strbuf_release(&buf);
1297 return ret;
1300 static void calculate_changed_submodule_paths(struct repository *r,
1301 struct string_list *changed_submodule_names)
1303 struct strvec argv = STRVEC_INIT;
1304 struct string_list_item *name;
1306 /* No need to check if no submodules would be fetched */
1307 if (!submodule_from_path(r, NULL, NULL) &&
1308 !repo_has_absorbed_submodules(r))
1309 return;
1311 strvec_push(&argv, "--"); /* argv[0] program name */
1312 oid_array_for_each_unique(&ref_tips_after_fetch,
1313 append_oid_to_argv, &argv);
1314 strvec_push(&argv, "--not");
1315 oid_array_for_each_unique(&ref_tips_before_fetch,
1316 append_oid_to_argv, &argv);
1319 * Collect all submodules (whether checked out or not) for which new
1320 * commits have been recorded upstream in "changed_submodule_names".
1322 collect_changed_submodules(r, changed_submodule_names, &argv);
1324 for_each_string_list_item(name, changed_submodule_names) {
1325 struct changed_submodule_data *cs_data = name->util;
1326 const struct submodule *submodule;
1327 const char *path = NULL;
1329 submodule = submodule_from_name(r, null_oid(), name->string);
1330 if (submodule)
1331 path = submodule->path;
1332 else
1333 path = default_name_or_path(name->string);
1335 if (!path)
1336 continue;
1338 if (submodule_has_commits(r, path, null_oid(), &cs_data->new_commits)) {
1339 changed_submodule_data_clear(cs_data);
1340 *name->string = '\0';
1344 string_list_remove_empty_items(changed_submodule_names, 1);
1346 strvec_clear(&argv);
1347 oid_array_clear(&ref_tips_before_fetch);
1348 oid_array_clear(&ref_tips_after_fetch);
1349 initialized_fetch_ref_tips = 0;
1352 int submodule_touches_in_range(struct repository *r,
1353 struct object_id *excl_oid,
1354 struct object_id *incl_oid)
1356 struct string_list subs = STRING_LIST_INIT_DUP;
1357 struct strvec args = STRVEC_INIT;
1358 int ret;
1360 /* No need to check if there are no submodules configured */
1361 if (!submodule_from_path(r, NULL, NULL))
1362 return 0;
1364 strvec_push(&args, "--"); /* args[0] program name */
1365 strvec_push(&args, oid_to_hex(incl_oid));
1366 if (!is_null_oid(excl_oid)) {
1367 strvec_push(&args, "--not");
1368 strvec_push(&args, oid_to_hex(excl_oid));
1371 collect_changed_submodules(r, &subs, &args);
1372 ret = subs.nr;
1374 strvec_clear(&args);
1376 free_submodules_data(&subs);
1377 return ret;
1380 struct submodule_parallel_fetch {
1382 * The index of the last index entry processed by
1383 * get_fetch_task_from_index().
1385 int index_count;
1387 * The index of the last string_list entry processed by
1388 * get_fetch_task_from_changed().
1390 int changed_count;
1391 struct strvec args;
1392 struct repository *r;
1393 const char *prefix;
1394 int command_line_option;
1395 int default_option;
1396 int quiet;
1397 int result;
1400 * Names of submodules that have new commits. Generated by
1401 * walking the newly fetched superproject commits.
1403 struct string_list changed_submodule_names;
1405 * Names of submodules that have already been processed. Lets us
1406 * avoid fetching the same submodule more than once.
1408 struct string_list seen_submodule_names;
1410 /* Pending fetches by OIDs */
1411 struct fetch_task **oid_fetch_tasks;
1412 int oid_fetch_tasks_nr, oid_fetch_tasks_alloc;
1414 struct strbuf submodules_with_errors;
1416 #define SPF_INIT { \
1417 .args = STRVEC_INIT, \
1418 .changed_submodule_names = STRING_LIST_INIT_DUP, \
1419 .seen_submodule_names = STRING_LIST_INIT_DUP, \
1420 .submodules_with_errors = STRBUF_INIT, \
1423 static int get_fetch_recurse_config(const struct submodule *submodule,
1424 struct submodule_parallel_fetch *spf)
1426 if (spf->command_line_option != RECURSE_SUBMODULES_DEFAULT)
1427 return spf->command_line_option;
1429 if (submodule) {
1430 char *key;
1431 const char *value;
1433 int fetch_recurse = submodule->fetch_recurse;
1434 key = xstrfmt("submodule.%s.fetchRecurseSubmodules", submodule->name);
1435 if (!repo_config_get_string_tmp(spf->r, key, &value)) {
1436 fetch_recurse = parse_fetch_recurse_submodules_arg(key, value);
1438 free(key);
1440 if (fetch_recurse != RECURSE_SUBMODULES_NONE)
1441 /* local config overrules everything except commandline */
1442 return fetch_recurse;
1445 return spf->default_option;
1449 * Fetch in progress (if callback data) or
1450 * pending (if in oid_fetch_tasks in struct submodule_parallel_fetch)
1452 struct fetch_task {
1453 struct repository *repo;
1454 const struct submodule *sub;
1455 unsigned free_sub : 1; /* Do we need to free the submodule? */
1456 const char *default_argv; /* The default fetch mode. */
1457 struct strvec git_args; /* Args for the child git process. */
1459 struct oid_array *commits; /* Ensure these commits are fetched */
1463 * When a submodule is not defined in .gitmodules, we cannot access it
1464 * via the regular submodule-config. Create a fake submodule, which we can
1465 * work on.
1467 static const struct submodule *get_non_gitmodules_submodule(const char *path)
1469 struct submodule *ret = NULL;
1470 const char *name = default_name_or_path(path);
1472 if (!name)
1473 return NULL;
1475 ret = xmalloc(sizeof(*ret));
1476 memset(ret, 0, sizeof(*ret));
1477 ret->path = name;
1478 ret->name = name;
1480 return (const struct submodule *) ret;
1483 static void fetch_task_release(struct fetch_task *p)
1485 if (p->free_sub)
1486 free((void*)p->sub);
1487 p->free_sub = 0;
1488 p->sub = NULL;
1490 if (p->repo)
1491 repo_clear(p->repo);
1492 FREE_AND_NULL(p->repo);
1494 strvec_clear(&p->git_args);
1497 static struct repository *get_submodule_repo_for(struct repository *r,
1498 const char *path,
1499 const struct object_id *treeish_name)
1501 struct repository *ret = xmalloc(sizeof(*ret));
1503 if (repo_submodule_init(ret, r, path, treeish_name)) {
1504 free(ret);
1505 return NULL;
1508 return ret;
1511 static struct fetch_task *fetch_task_create(struct submodule_parallel_fetch *spf,
1512 const char *path,
1513 const struct object_id *treeish_name)
1515 struct fetch_task *task = xmalloc(sizeof(*task));
1516 memset(task, 0, sizeof(*task));
1518 task->sub = submodule_from_path(spf->r, treeish_name, path);
1520 if (!task->sub) {
1522 * No entry in .gitmodules? Technically not a submodule,
1523 * but historically we supported repositories that happen to be
1524 * in-place where a gitlink is. Keep supporting them.
1526 task->sub = get_non_gitmodules_submodule(path);
1527 if (!task->sub)
1528 goto cleanup;
1530 task->free_sub = 1;
1533 if (string_list_lookup(&spf->seen_submodule_names, task->sub->name))
1534 goto cleanup;
1536 switch (get_fetch_recurse_config(task->sub, spf))
1538 default:
1539 case RECURSE_SUBMODULES_DEFAULT:
1540 case RECURSE_SUBMODULES_ON_DEMAND:
1541 if (!task->sub ||
1542 !string_list_lookup(
1543 &spf->changed_submodule_names,
1544 task->sub->name))
1545 goto cleanup;
1546 task->default_argv = "on-demand";
1547 break;
1548 case RECURSE_SUBMODULES_ON:
1549 task->default_argv = "yes";
1550 break;
1551 case RECURSE_SUBMODULES_OFF:
1552 goto cleanup;
1555 task->repo = get_submodule_repo_for(spf->r, path, treeish_name);
1557 return task;
1559 cleanup:
1560 fetch_task_release(task);
1561 free(task);
1562 return NULL;
1565 static struct fetch_task *
1566 get_fetch_task_from_index(struct submodule_parallel_fetch *spf,
1567 struct strbuf *err)
1569 for (; spf->index_count < spf->r->index->cache_nr; spf->index_count++) {
1570 const struct cache_entry *ce =
1571 spf->r->index->cache[spf->index_count];
1572 struct fetch_task *task;
1574 if (!S_ISGITLINK(ce->ce_mode))
1575 continue;
1577 task = fetch_task_create(spf, ce->name, null_oid());
1578 if (!task)
1579 continue;
1581 if (task->repo) {
1582 if (!spf->quiet)
1583 strbuf_addf(err, _("Fetching submodule %s%s\n"),
1584 spf->prefix, ce->name);
1586 spf->index_count++;
1587 return task;
1588 } else {
1589 struct strbuf empty_submodule_path = STRBUF_INIT;
1591 fetch_task_release(task);
1592 free(task);
1595 * An empty directory is normal,
1596 * the submodule is not initialized
1598 strbuf_addf(&empty_submodule_path, "%s/%s/",
1599 spf->r->worktree,
1600 ce->name);
1601 if (S_ISGITLINK(ce->ce_mode) &&
1602 !is_empty_dir(empty_submodule_path.buf)) {
1603 spf->result = 1;
1604 strbuf_addf(err,
1605 _("Could not access submodule '%s'\n"),
1606 ce->name);
1608 strbuf_release(&empty_submodule_path);
1611 return NULL;
1614 static struct fetch_task *
1615 get_fetch_task_from_changed(struct submodule_parallel_fetch *spf,
1616 struct strbuf *err)
1618 for (; spf->changed_count < spf->changed_submodule_names.nr;
1619 spf->changed_count++) {
1620 struct string_list_item item =
1621 spf->changed_submodule_names.items[spf->changed_count];
1622 struct changed_submodule_data *cs_data = item.util;
1623 struct fetch_task *task;
1625 if (!is_tree_submodule_active(spf->r, cs_data->super_oid,cs_data->path))
1626 continue;
1628 task = fetch_task_create(spf, cs_data->path,
1629 cs_data->super_oid);
1630 if (!task)
1631 continue;
1633 if (!task->repo) {
1634 strbuf_addf(err, _("Could not access submodule '%s' at commit %s\n"),
1635 cs_data->path,
1636 repo_find_unique_abbrev(the_repository, cs_data->super_oid, DEFAULT_ABBREV));
1638 fetch_task_release(task);
1639 free(task);
1640 continue;
1643 if (!spf->quiet)
1644 strbuf_addf(err,
1645 _("Fetching submodule %s%s at commit %s\n"),
1646 spf->prefix, task->sub->path,
1647 repo_find_unique_abbrev(the_repository, cs_data->super_oid,
1648 DEFAULT_ABBREV));
1650 spf->changed_count++;
1652 * NEEDSWORK: Submodules set/unset a value for
1653 * core.worktree when they are populated/unpopulated by
1654 * "git checkout" (and similar commands, see
1655 * submodule_move_head() and
1656 * connect_work_tree_and_git_dir()), but if the
1657 * submodule is unpopulated in another way (e.g. "git
1658 * rm", "rm -r"), core.worktree will still be set even
1659 * though the directory doesn't exist, and the child
1660 * process will crash while trying to chdir into the
1661 * nonexistent directory.
1663 * In this case, we know that the submodule has no
1664 * working tree, so we can work around this by
1665 * setting "--work-tree=." (--bare does not work because
1666 * worktree settings take precedence over bare-ness).
1667 * However, this is not necessarily true in other cases,
1668 * so a generalized solution is still necessary.
1670 * Possible solutions:
1671 * - teach "git [add|rm]" to unset core.worktree and
1672 * discourage users from removing submodules without
1673 * using a Git command.
1674 * - teach submodule child processes to ignore stale
1675 * core.worktree values.
1677 strvec_push(&task->git_args, "--work-tree=.");
1678 return task;
1680 return NULL;
1683 static int get_next_submodule(struct child_process *cp, struct strbuf *err,
1684 void *data, void **task_cb)
1686 struct submodule_parallel_fetch *spf = data;
1687 struct fetch_task *task =
1688 get_fetch_task_from_index(spf, err);
1689 if (!task)
1690 task = get_fetch_task_from_changed(spf, err);
1692 if (task) {
1693 struct strbuf submodule_prefix = STRBUF_INIT;
1695 child_process_init(cp);
1696 cp->dir = task->repo->gitdir;
1697 prepare_submodule_repo_env_in_gitdir(&cp->env);
1698 cp->git_cmd = 1;
1699 strvec_init(&cp->args);
1700 if (task->git_args.nr)
1701 strvec_pushv(&cp->args, task->git_args.v);
1702 strvec_pushv(&cp->args, spf->args.v);
1703 strvec_push(&cp->args, task->default_argv);
1704 strvec_push(&cp->args, "--submodule-prefix");
1706 strbuf_addf(&submodule_prefix, "%s%s/",
1707 spf->prefix,
1708 task->sub->path);
1709 strvec_push(&cp->args, submodule_prefix.buf);
1710 *task_cb = task;
1712 strbuf_release(&submodule_prefix);
1713 string_list_insert(&spf->seen_submodule_names, task->sub->name);
1714 return 1;
1717 if (spf->oid_fetch_tasks_nr) {
1718 struct fetch_task *task =
1719 spf->oid_fetch_tasks[spf->oid_fetch_tasks_nr - 1];
1720 struct strbuf submodule_prefix = STRBUF_INIT;
1721 spf->oid_fetch_tasks_nr--;
1723 strbuf_addf(&submodule_prefix, "%s%s/",
1724 spf->prefix, task->sub->path);
1726 child_process_init(cp);
1727 prepare_submodule_repo_env_in_gitdir(&cp->env);
1728 cp->git_cmd = 1;
1729 cp->dir = task->repo->gitdir;
1731 strvec_init(&cp->args);
1732 strvec_pushv(&cp->args, spf->args.v);
1733 strvec_push(&cp->args, "on-demand");
1734 strvec_push(&cp->args, "--submodule-prefix");
1735 strvec_push(&cp->args, submodule_prefix.buf);
1737 /* NEEDSWORK: have get_default_remote from submodule--helper */
1738 strvec_push(&cp->args, "origin");
1739 oid_array_for_each_unique(task->commits,
1740 append_oid_to_argv, &cp->args);
1742 *task_cb = task;
1743 strbuf_release(&submodule_prefix);
1744 return 1;
1747 return 0;
1750 static int fetch_start_failure(struct strbuf *err UNUSED,
1751 void *cb, void *task_cb)
1753 struct submodule_parallel_fetch *spf = cb;
1754 struct fetch_task *task = task_cb;
1756 spf->result = 1;
1758 fetch_task_release(task);
1759 return 0;
1762 static int commit_missing_in_sub(const struct object_id *oid, void *data)
1764 struct repository *subrepo = data;
1766 enum object_type type = oid_object_info(subrepo, oid, NULL);
1768 return type != OBJ_COMMIT;
1771 static int fetch_finish(int retvalue, struct strbuf *err UNUSED,
1772 void *cb, void *task_cb)
1774 struct submodule_parallel_fetch *spf = cb;
1775 struct fetch_task *task = task_cb;
1777 struct string_list_item *it;
1778 struct changed_submodule_data *cs_data;
1780 if (!task || !task->sub)
1781 BUG("callback cookie bogus");
1783 if (retvalue) {
1785 * NEEDSWORK: This indicates that the overall fetch
1786 * failed, even though there may be a subsequent fetch
1787 * by commit hash that might work. It may be a good
1788 * idea to not indicate failure in this case, and only
1789 * indicate failure if the subsequent fetch fails.
1791 spf->result = 1;
1793 strbuf_addf(&spf->submodules_with_errors, "\t%s\n",
1794 task->sub->name);
1797 /* Is this the second time we process this submodule? */
1798 if (task->commits)
1799 goto out;
1801 it = string_list_lookup(&spf->changed_submodule_names, task->sub->name);
1802 if (!it)
1803 /* Could be an unchanged submodule, not contained in the list */
1804 goto out;
1806 cs_data = it->util;
1807 oid_array_filter(&cs_data->new_commits,
1808 commit_missing_in_sub,
1809 task->repo);
1811 /* Are there commits we want, but do not exist? */
1812 if (cs_data->new_commits.nr) {
1813 task->commits = &cs_data->new_commits;
1814 ALLOC_GROW(spf->oid_fetch_tasks,
1815 spf->oid_fetch_tasks_nr + 1,
1816 spf->oid_fetch_tasks_alloc);
1817 spf->oid_fetch_tasks[spf->oid_fetch_tasks_nr] = task;
1818 spf->oid_fetch_tasks_nr++;
1819 return 0;
1822 out:
1823 fetch_task_release(task);
1825 return 0;
1828 int fetch_submodules(struct repository *r,
1829 const struct strvec *options,
1830 const char *prefix, int command_line_option,
1831 int default_option,
1832 int quiet, int max_parallel_jobs)
1834 int i;
1835 struct submodule_parallel_fetch spf = SPF_INIT;
1836 const struct run_process_parallel_opts opts = {
1837 .tr2_category = "submodule",
1838 .tr2_label = "parallel/fetch",
1840 .processes = max_parallel_jobs,
1842 .get_next_task = get_next_submodule,
1843 .start_failure = fetch_start_failure,
1844 .task_finished = fetch_finish,
1845 .data = &spf,
1848 spf.r = r;
1849 spf.command_line_option = command_line_option;
1850 spf.default_option = default_option;
1851 spf.quiet = quiet;
1852 spf.prefix = prefix;
1854 if (!r->worktree)
1855 goto out;
1857 if (repo_read_index(r) < 0)
1858 die(_("index file corrupt"));
1860 strvec_push(&spf.args, "fetch");
1861 for (i = 0; i < options->nr; i++)
1862 strvec_push(&spf.args, options->v[i]);
1863 strvec_push(&spf.args, "--recurse-submodules-default");
1864 /* default value, "--submodule-prefix" and its value are added later */
1866 calculate_changed_submodule_paths(r, &spf.changed_submodule_names);
1867 string_list_sort(&spf.changed_submodule_names);
1868 run_processes_parallel(&opts);
1870 if (spf.submodules_with_errors.len > 0)
1871 fprintf(stderr, _("Errors during submodule fetch:\n%s"),
1872 spf.submodules_with_errors.buf);
1875 strvec_clear(&spf.args);
1876 out:
1877 free_submodules_data(&spf.changed_submodule_names);
1878 return spf.result;
1881 unsigned is_submodule_modified(const char *path, int ignore_untracked)
1883 struct child_process cp = CHILD_PROCESS_INIT;
1884 struct strbuf buf = STRBUF_INIT;
1885 FILE *fp;
1886 unsigned dirty_submodule = 0;
1887 const char *git_dir;
1888 int ignore_cp_exit_code = 0;
1890 strbuf_addf(&buf, "%s/.git", path);
1891 git_dir = read_gitfile(buf.buf);
1892 if (!git_dir)
1893 git_dir = buf.buf;
1894 if (!is_git_directory(git_dir)) {
1895 if (is_directory(git_dir))
1896 die(_("'%s' not recognized as a git repository"), git_dir);
1897 strbuf_release(&buf);
1898 /* The submodule is not checked out, so it is not modified */
1899 return 0;
1901 strbuf_reset(&buf);
1903 strvec_pushl(&cp.args, "status", "--porcelain=2", NULL);
1904 if (ignore_untracked)
1905 strvec_push(&cp.args, "-uno");
1907 prepare_submodule_repo_env(&cp.env);
1908 cp.git_cmd = 1;
1909 cp.no_stdin = 1;
1910 cp.out = -1;
1911 cp.dir = path;
1912 if (start_command(&cp))
1913 die(_("Could not run 'git status --porcelain=2' in submodule %s"), path);
1915 fp = xfdopen(cp.out, "r");
1916 while (strbuf_getwholeline(&buf, fp, '\n') != EOF) {
1917 /* regular untracked files */
1918 if (buf.buf[0] == '?')
1919 dirty_submodule |= DIRTY_SUBMODULE_UNTRACKED;
1921 if (buf.buf[0] == 'u' ||
1922 buf.buf[0] == '1' ||
1923 buf.buf[0] == '2') {
1924 /* T = line type, XY = status, SSSS = submodule state */
1925 if (buf.len < strlen("T XY SSSS"))
1926 BUG("invalid status --porcelain=2 line %s",
1927 buf.buf);
1929 if (buf.buf[5] == 'S' && buf.buf[8] == 'U')
1930 /* nested untracked file */
1931 dirty_submodule |= DIRTY_SUBMODULE_UNTRACKED;
1933 if (buf.buf[0] == 'u' ||
1934 buf.buf[0] == '2' ||
1935 memcmp(buf.buf + 5, "S..U", 4))
1936 /* other change */
1937 dirty_submodule |= DIRTY_SUBMODULE_MODIFIED;
1940 if ((dirty_submodule & DIRTY_SUBMODULE_MODIFIED) &&
1941 ((dirty_submodule & DIRTY_SUBMODULE_UNTRACKED) ||
1942 ignore_untracked)) {
1944 * We're not interested in any further information from
1945 * the child any more, neither output nor its exit code.
1947 ignore_cp_exit_code = 1;
1948 break;
1951 fclose(fp);
1953 if (finish_command(&cp) && !ignore_cp_exit_code)
1954 die(_("'git status --porcelain=2' failed in submodule %s"), path);
1956 strbuf_release(&buf);
1957 return dirty_submodule;
1960 int submodule_uses_gitfile(const char *path)
1962 struct child_process cp = CHILD_PROCESS_INIT;
1963 struct strbuf buf = STRBUF_INIT;
1964 const char *git_dir;
1966 strbuf_addf(&buf, "%s/.git", path);
1967 git_dir = read_gitfile(buf.buf);
1968 if (!git_dir) {
1969 strbuf_release(&buf);
1970 return 0;
1972 strbuf_release(&buf);
1974 /* Now test that all nested submodules use a gitfile too */
1975 strvec_pushl(&cp.args,
1976 "submodule", "foreach", "--quiet", "--recursive",
1977 "test -f .git", NULL);
1979 prepare_submodule_repo_env(&cp.env);
1980 cp.git_cmd = 1;
1981 cp.no_stdin = 1;
1982 cp.no_stderr = 1;
1983 cp.no_stdout = 1;
1984 cp.dir = path;
1985 if (run_command(&cp))
1986 return 0;
1988 return 1;
1992 * Check if it is a bad idea to remove a submodule, i.e. if we'd lose data
1993 * when doing so.
1995 * Return 1 if we'd lose data, return 0 if the removal is fine,
1996 * and negative values for errors.
1998 int bad_to_remove_submodule(const char *path, unsigned flags)
2000 ssize_t len;
2001 struct child_process cp = CHILD_PROCESS_INIT;
2002 struct strbuf buf = STRBUF_INIT;
2003 int ret = 0;
2005 if (!file_exists(path) || is_empty_dir(path))
2006 return 0;
2008 if (!submodule_uses_gitfile(path))
2009 return 1;
2011 strvec_pushl(&cp.args, "status", "--porcelain",
2012 "--ignore-submodules=none", NULL);
2014 if (flags & SUBMODULE_REMOVAL_IGNORE_UNTRACKED)
2015 strvec_push(&cp.args, "-uno");
2016 else
2017 strvec_push(&cp.args, "-uall");
2019 if (!(flags & SUBMODULE_REMOVAL_IGNORE_IGNORED_UNTRACKED))
2020 strvec_push(&cp.args, "--ignored");
2022 prepare_submodule_repo_env(&cp.env);
2023 cp.git_cmd = 1;
2024 cp.no_stdin = 1;
2025 cp.out = -1;
2026 cp.dir = path;
2027 if (start_command(&cp)) {
2028 if (flags & SUBMODULE_REMOVAL_DIE_ON_ERROR)
2029 die(_("could not start 'git status' in submodule '%s'"),
2030 path);
2031 ret = -1;
2032 goto out;
2035 len = strbuf_read(&buf, cp.out, 1024);
2036 if (len > 2)
2037 ret = 1;
2038 close(cp.out);
2040 if (finish_command(&cp)) {
2041 if (flags & SUBMODULE_REMOVAL_DIE_ON_ERROR)
2042 die(_("could not run 'git status' in submodule '%s'"),
2043 path);
2044 ret = -1;
2046 out:
2047 strbuf_release(&buf);
2048 return ret;
2051 void submodule_unset_core_worktree(const struct submodule *sub)
2053 struct strbuf config_path = STRBUF_INIT;
2055 submodule_name_to_gitdir(&config_path, the_repository, sub->name);
2056 strbuf_addstr(&config_path, "/config");
2058 if (git_config_set_in_file_gently(config_path.buf, "core.worktree", NULL))
2059 warning(_("Could not unset core.worktree setting in submodule '%s'"),
2060 sub->path);
2062 strbuf_release(&config_path);
2065 static int submodule_has_dirty_index(const struct submodule *sub)
2067 struct child_process cp = CHILD_PROCESS_INIT;
2069 prepare_submodule_repo_env(&cp.env);
2071 cp.git_cmd = 1;
2072 strvec_pushl(&cp.args, "diff-index", "--quiet",
2073 "--cached", "HEAD", NULL);
2074 cp.no_stdin = 1;
2075 cp.no_stdout = 1;
2076 cp.dir = sub->path;
2077 if (start_command(&cp))
2078 die(_("could not recurse into submodule '%s'"), sub->path);
2080 return finish_command(&cp);
2083 static void submodule_reset_index(const char *path, const char *super_prefix)
2085 struct child_process cp = CHILD_PROCESS_INIT;
2086 prepare_submodule_repo_env(&cp.env);
2088 cp.git_cmd = 1;
2089 cp.no_stdin = 1;
2090 cp.dir = path;
2092 /* TODO: determine if this might overwright untracked files */
2093 strvec_pushl(&cp.args, "read-tree", "-u", "--reset", NULL);
2094 strvec_pushf(&cp.args, "--super-prefix=%s%s/",
2095 (super_prefix ? super_prefix : ""), path);
2097 strvec_push(&cp.args, empty_tree_oid_hex());
2099 if (run_command(&cp))
2100 die(_("could not reset submodule index"));
2104 * Moves a submodule at a given path from a given head to another new head.
2105 * For edge cases (a submodule coming into existence or removing a submodule)
2106 * pass NULL for old or new respectively.
2108 int submodule_move_head(const char *path, const char *super_prefix,
2109 const char *old_head, const char *new_head,
2110 unsigned flags)
2112 int ret = 0;
2113 struct child_process cp = CHILD_PROCESS_INIT;
2114 const struct submodule *sub;
2115 int *error_code_ptr, error_code;
2117 if (!is_submodule_active(the_repository, path))
2118 return 0;
2120 if (flags & SUBMODULE_MOVE_HEAD_FORCE)
2122 * Pass non NULL pointer to is_submodule_populated_gently
2123 * to prevent die()-ing. We'll use connect_work_tree_and_git_dir
2124 * to fixup the submodule in the force case later.
2126 error_code_ptr = &error_code;
2127 else
2128 error_code_ptr = NULL;
2130 if (old_head && !is_submodule_populated_gently(path, error_code_ptr))
2131 return 0;
2133 sub = submodule_from_path(the_repository, null_oid(), path);
2135 if (!sub)
2136 BUG("could not get submodule information for '%s'", path);
2138 if (old_head && !(flags & SUBMODULE_MOVE_HEAD_FORCE)) {
2139 /* Check if the submodule has a dirty index. */
2140 if (submodule_has_dirty_index(sub))
2141 return error(_("submodule '%s' has dirty index"), path);
2144 if (!(flags & SUBMODULE_MOVE_HEAD_DRY_RUN)) {
2145 if (old_head) {
2146 if (!submodule_uses_gitfile(path))
2147 absorb_git_dir_into_superproject(path,
2148 super_prefix);
2149 } else {
2150 struct strbuf gitdir = STRBUF_INIT;
2151 submodule_name_to_gitdir(&gitdir, the_repository,
2152 sub->name);
2153 connect_work_tree_and_git_dir(path, gitdir.buf, 0);
2154 strbuf_release(&gitdir);
2156 /* make sure the index is clean as well */
2157 submodule_reset_index(path, super_prefix);
2160 if (old_head && (flags & SUBMODULE_MOVE_HEAD_FORCE)) {
2161 struct strbuf gitdir = STRBUF_INIT;
2162 submodule_name_to_gitdir(&gitdir, the_repository,
2163 sub->name);
2164 connect_work_tree_and_git_dir(path, gitdir.buf, 1);
2165 strbuf_release(&gitdir);
2169 prepare_submodule_repo_env(&cp.env);
2171 cp.git_cmd = 1;
2172 cp.no_stdin = 1;
2173 cp.dir = path;
2175 strvec_pushl(&cp.args, "read-tree", "--recurse-submodules", NULL);
2176 strvec_pushf(&cp.args, "--super-prefix=%s%s/",
2177 (super_prefix ? super_prefix : ""), path);
2179 if (flags & SUBMODULE_MOVE_HEAD_DRY_RUN)
2180 strvec_push(&cp.args, "-n");
2181 else
2182 strvec_push(&cp.args, "-u");
2184 if (flags & SUBMODULE_MOVE_HEAD_FORCE)
2185 strvec_push(&cp.args, "--reset");
2186 else
2187 strvec_push(&cp.args, "-m");
2189 if (!(flags & SUBMODULE_MOVE_HEAD_FORCE))
2190 strvec_push(&cp.args, old_head ? old_head : empty_tree_oid_hex());
2192 strvec_push(&cp.args, new_head ? new_head : empty_tree_oid_hex());
2194 if (run_command(&cp)) {
2195 ret = error(_("Submodule '%s' could not be updated."), path);
2196 goto out;
2199 if (!(flags & SUBMODULE_MOVE_HEAD_DRY_RUN)) {
2200 if (new_head) {
2201 child_process_init(&cp);
2202 /* also set the HEAD accordingly */
2203 cp.git_cmd = 1;
2204 cp.no_stdin = 1;
2205 cp.dir = path;
2207 prepare_submodule_repo_env(&cp.env);
2208 strvec_pushl(&cp.args, "update-ref", "HEAD",
2209 "--no-deref", new_head, NULL);
2211 if (run_command(&cp)) {
2212 ret = -1;
2213 goto out;
2215 } else {
2216 struct strbuf sb = STRBUF_INIT;
2218 strbuf_addf(&sb, "%s/.git", path);
2219 unlink_or_warn(sb.buf);
2220 strbuf_release(&sb);
2222 if (is_empty_dir(path))
2223 rmdir_or_warn(path);
2225 submodule_unset_core_worktree(sub);
2228 out:
2229 return ret;
2232 int validate_submodule_git_dir(char *git_dir, const char *submodule_name)
2234 size_t len = strlen(git_dir), suffix_len = strlen(submodule_name);
2235 char *p;
2236 int ret = 0;
2238 if (len <= suffix_len || (p = git_dir + len - suffix_len)[-1] != '/' ||
2239 strcmp(p, submodule_name))
2240 BUG("submodule name '%s' not a suffix of git dir '%s'",
2241 submodule_name, git_dir);
2244 * We prevent the contents of sibling submodules' git directories to
2245 * clash.
2247 * Example: having a submodule named `hippo` and another one named
2248 * `hippo/hooks` would result in the git directories
2249 * `.git/modules/hippo/` and `.git/modules/hippo/hooks/`, respectively,
2250 * but the latter directory is already designated to contain the hooks
2251 * of the former.
2253 for (; *p; p++) {
2254 if (is_dir_sep(*p)) {
2255 char c = *p;
2257 *p = '\0';
2258 if (is_git_directory(git_dir))
2259 ret = -1;
2260 *p = c;
2262 if (ret < 0)
2263 return error(_("submodule git dir '%s' is "
2264 "inside git dir '%.*s'"),
2265 git_dir,
2266 (int)(p - git_dir), git_dir);
2270 return 0;
2274 * Embeds a single submodules git directory into the superprojects git dir,
2275 * non recursively.
2277 static void relocate_single_git_dir_into_superproject(const char *path,
2278 const char *super_prefix)
2280 char *old_git_dir = NULL, *real_old_git_dir = NULL, *real_new_git_dir = NULL;
2281 struct strbuf new_gitdir = STRBUF_INIT;
2282 const struct submodule *sub;
2284 if (submodule_uses_worktrees(path))
2285 die(_("relocate_gitdir for submodule '%s' with "
2286 "more than one worktree not supported"), path);
2288 old_git_dir = xstrfmt("%s/.git", path);
2289 if (read_gitfile(old_git_dir))
2290 /* If it is an actual gitfile, it doesn't need migration. */
2291 return;
2293 real_old_git_dir = real_pathdup(old_git_dir, 1);
2295 sub = submodule_from_path(the_repository, null_oid(), path);
2296 if (!sub)
2297 die(_("could not lookup name for submodule '%s'"), path);
2299 submodule_name_to_gitdir(&new_gitdir, the_repository, sub->name);
2300 if (validate_submodule_git_dir(new_gitdir.buf, sub->name) < 0)
2301 die(_("refusing to move '%s' into an existing git dir"),
2302 real_old_git_dir);
2303 if (safe_create_leading_directories_const(new_gitdir.buf) < 0)
2304 die(_("could not create directory '%s'"), new_gitdir.buf);
2305 real_new_git_dir = real_pathdup(new_gitdir.buf, 1);
2307 fprintf(stderr, _("Migrating git directory of '%s%s' from\n'%s' to\n'%s'\n"),
2308 super_prefix ? super_prefix : "", path,
2309 real_old_git_dir, real_new_git_dir);
2311 relocate_gitdir(path, real_old_git_dir, real_new_git_dir);
2313 free(old_git_dir);
2314 free(real_old_git_dir);
2315 free(real_new_git_dir);
2316 strbuf_release(&new_gitdir);
2319 static void absorb_git_dir_into_superproject_recurse(const char *path,
2320 const char *super_prefix)
2323 struct child_process cp = CHILD_PROCESS_INIT;
2325 cp.dir = path;
2326 cp.git_cmd = 1;
2327 cp.no_stdin = 1;
2328 strvec_pushl(&cp.args, "submodule--helper",
2329 "absorbgitdirs", NULL);
2330 strvec_pushf(&cp.args, "--super-prefix=%s%s/", super_prefix ?
2331 super_prefix : "", path);
2333 prepare_submodule_repo_env(&cp.env);
2334 if (run_command(&cp))
2335 die(_("could not recurse into submodule '%s'"), path);
2339 * Migrate the git directory of the submodule given by path from
2340 * having its git directory within the working tree to the git dir nested
2341 * in its superprojects git dir under modules/.
2343 void absorb_git_dir_into_superproject(const char *path,
2344 const char *super_prefix)
2346 int err_code;
2347 const char *sub_git_dir;
2348 struct strbuf gitdir = STRBUF_INIT;
2349 strbuf_addf(&gitdir, "%s/.git", path);
2350 sub_git_dir = resolve_gitdir_gently(gitdir.buf, &err_code);
2352 /* Not populated? */
2353 if (!sub_git_dir) {
2354 const struct submodule *sub;
2355 struct strbuf sub_gitdir = STRBUF_INIT;
2357 if (err_code == READ_GITFILE_ERR_STAT_FAILED) {
2358 /* unpopulated as expected */
2359 strbuf_release(&gitdir);
2360 return;
2363 if (err_code != READ_GITFILE_ERR_NOT_A_REPO)
2364 /* We don't know what broke here. */
2365 read_gitfile_error_die(err_code, path, NULL);
2368 * Maybe populated, but no git directory was found?
2369 * This can happen if the superproject is a submodule
2370 * itself and was just absorbed. The absorption of the
2371 * superproject did not rewrite the git file links yet,
2372 * fix it now.
2374 sub = submodule_from_path(the_repository, null_oid(), path);
2375 if (!sub)
2376 die(_("could not lookup name for submodule '%s'"), path);
2377 submodule_name_to_gitdir(&sub_gitdir, the_repository, sub->name);
2378 connect_work_tree_and_git_dir(path, sub_gitdir.buf, 0);
2379 strbuf_release(&sub_gitdir);
2380 } else {
2381 /* Is it already absorbed into the superprojects git dir? */
2382 char *real_sub_git_dir = real_pathdup(sub_git_dir, 1);
2383 char *real_common_git_dir = real_pathdup(get_git_common_dir(), 1);
2385 if (!starts_with(real_sub_git_dir, real_common_git_dir))
2386 relocate_single_git_dir_into_superproject(path, super_prefix);
2388 free(real_sub_git_dir);
2389 free(real_common_git_dir);
2391 strbuf_release(&gitdir);
2393 absorb_git_dir_into_superproject_recurse(path, super_prefix);
2396 int get_superproject_working_tree(struct strbuf *buf)
2398 struct child_process cp = CHILD_PROCESS_INIT;
2399 struct strbuf sb = STRBUF_INIT;
2400 struct strbuf one_up = STRBUF_INIT;
2401 char *cwd = xgetcwd();
2402 int ret = 0;
2403 const char *subpath;
2404 int code;
2405 ssize_t len;
2407 if (!is_inside_work_tree())
2409 * FIXME:
2410 * We might have a superproject, but it is harder
2411 * to determine.
2413 return 0;
2415 if (!strbuf_realpath(&one_up, "../", 0))
2416 return 0;
2418 subpath = relative_path(cwd, one_up.buf, &sb);
2419 strbuf_release(&one_up);
2421 prepare_submodule_repo_env(&cp.env);
2422 strvec_pop(&cp.env);
2424 strvec_pushl(&cp.args, "--literal-pathspecs", "-C", "..",
2425 "ls-files", "-z", "--stage", "--full-name", "--",
2426 subpath, NULL);
2427 strbuf_reset(&sb);
2429 cp.no_stdin = 1;
2430 cp.no_stderr = 1;
2431 cp.out = -1;
2432 cp.git_cmd = 1;
2434 if (start_command(&cp))
2435 die(_("could not start ls-files in .."));
2437 len = strbuf_read(&sb, cp.out, PATH_MAX);
2438 close(cp.out);
2440 if (starts_with(sb.buf, "160000")) {
2441 int super_sub_len;
2442 int cwd_len = strlen(cwd);
2443 char *super_sub, *super_wt;
2446 * There is a superproject having this repo as a submodule.
2447 * The format is <mode> SP <hash> SP <stage> TAB <full name> \0,
2448 * We're only interested in the name after the tab.
2450 super_sub = strchr(sb.buf, '\t') + 1;
2451 super_sub_len = strlen(super_sub);
2453 if (super_sub_len > cwd_len ||
2454 strcmp(&cwd[cwd_len - super_sub_len], super_sub))
2455 BUG("returned path string doesn't match cwd?");
2457 super_wt = xstrdup(cwd);
2458 super_wt[cwd_len - super_sub_len] = '\0';
2460 strbuf_realpath(buf, super_wt, 1);
2461 ret = 1;
2462 free(super_wt);
2464 free(cwd);
2465 strbuf_release(&sb);
2467 code = finish_command(&cp);
2469 if (code == 128)
2470 /* '../' is not a git repository */
2471 return 0;
2472 if (code == 0 && len == 0)
2473 /* There is an unrelated git repository at '../' */
2474 return 0;
2475 if (code)
2476 die(_("ls-tree returned unexpected return code %d"), code);
2478 return ret;
2482 * Put the gitdir for a submodule (given relative to the main
2483 * repository worktree) into `buf`, or return -1 on error.
2485 int submodule_to_gitdir(struct strbuf *buf, const char *submodule)
2487 const struct submodule *sub;
2488 const char *git_dir;
2489 int ret = 0;
2491 strbuf_reset(buf);
2492 strbuf_addstr(buf, submodule);
2493 strbuf_complete(buf, '/');
2494 strbuf_addstr(buf, ".git");
2496 git_dir = read_gitfile(buf->buf);
2497 if (git_dir) {
2498 strbuf_reset(buf);
2499 strbuf_addstr(buf, git_dir);
2501 if (!is_git_directory(buf->buf)) {
2502 sub = submodule_from_path(the_repository, null_oid(),
2503 submodule);
2504 if (!sub) {
2505 ret = -1;
2506 goto cleanup;
2508 strbuf_reset(buf);
2509 submodule_name_to_gitdir(buf, the_repository, sub->name);
2512 cleanup:
2513 return ret;
2516 void submodule_name_to_gitdir(struct strbuf *buf, struct repository *r,
2517 const char *submodule_name)
2520 * NEEDSWORK: The current way of mapping a submodule's name to
2521 * its location in .git/modules/ has problems with some naming
2522 * schemes. For example, if a submodule is named "foo" and
2523 * another is named "foo/bar" (whether present in the same
2524 * superproject commit or not - the problem will arise if both
2525 * superproject commits have been checked out at any point in
2526 * time), or if two submodule names only have different cases in
2527 * a case-insensitive filesystem.
2529 * There are several solutions, including encoding the path in
2530 * some way, introducing a submodule.<name>.gitdir config in
2531 * .git/config (not .gitmodules) that allows overriding what the
2532 * gitdir of a submodule would be (and teach Git, upon noticing
2533 * a clash, to automatically determine a non-clashing name and
2534 * to write such a config), or introducing a
2535 * submodule.<name>.gitdir config in .gitmodules that repo
2536 * administrators can explicitly set. Nothing has been decided,
2537 * so for now, just append the name at the end of the path.
2539 strbuf_repo_git_path(buf, r, "modules/");
2540 strbuf_addstr(buf, submodule_name);