builtin/bundle.c: remove superfluous "newargc" variable
[git.git] / submodule.c
blobbf7a2c79183e17eb3b6c4c8487938de6c01be565
2 #include "cache.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 "revision.h"
11 #include "run-command.h"
12 #include "diffcore.h"
13 #include "refs.h"
14 #include "string-list.h"
15 #include "oid-array.h"
16 #include "strvec.h"
17 #include "blob.h"
18 #include "thread-utils.h"
19 #include "quote.h"
20 #include "remote.h"
21 #include "worktree.h"
22 #include "parse-options.h"
23 #include "object-store.h"
24 #include "commit-reach.h"
25 #include "shallow.h"
27 static int config_update_recurse_submodules = RECURSE_SUBMODULES_OFF;
28 static int initialized_fetch_ref_tips;
29 static struct oid_array ref_tips_before_fetch;
30 static struct oid_array ref_tips_after_fetch;
33 * Check if the .gitmodules file is unmerged. Parsing of the .gitmodules file
34 * will be disabled because we can't guess what might be configured in
35 * .gitmodules unless the user resolves the conflict.
37 int is_gitmodules_unmerged(struct index_state *istate)
39 int pos = index_name_pos(istate, GITMODULES_FILE, strlen(GITMODULES_FILE));
40 if (pos < 0) { /* .gitmodules not found or isn't merged */
41 pos = -1 - pos;
42 if (istate->cache_nr > pos) { /* there is a .gitmodules */
43 const struct cache_entry *ce = istate->cache[pos];
44 if (ce_namelen(ce) == strlen(GITMODULES_FILE) &&
45 !strcmp(ce->name, GITMODULES_FILE))
46 return 1;
50 return 0;
54 * Check if the .gitmodules file is safe to write.
56 * Writing to the .gitmodules file requires that the file exists in the
57 * working tree or, if it doesn't, that a brand new .gitmodules file is going
58 * to be created (i.e. it's neither in the index nor in the current branch).
60 * It is not safe to write to .gitmodules if it's not in the working tree but
61 * it is in the index or in the current branch, because writing new values
62 * (and staging them) would blindly overwrite ALL the old content.
64 int is_writing_gitmodules_ok(void)
66 struct object_id oid;
67 return file_exists(GITMODULES_FILE) ||
68 (get_oid(GITMODULES_INDEX, &oid) < 0 && get_oid(GITMODULES_HEAD, &oid) < 0);
72 * Check if the .gitmodules file has unstaged modifications. This must be
73 * checked before allowing modifications to the .gitmodules file with the
74 * intention to stage them later, because when continuing we would stage the
75 * modifications the user didn't stage herself too. That might change in a
76 * future version when we learn to stage the changes we do ourselves without
77 * staging any previous modifications.
79 int is_staging_gitmodules_ok(struct index_state *istate)
81 int pos = index_name_pos(istate, GITMODULES_FILE, strlen(GITMODULES_FILE));
83 if ((pos >= 0) && (pos < istate->cache_nr)) {
84 struct stat st;
85 if (lstat(GITMODULES_FILE, &st) == 0 &&
86 ie_modified(istate, istate->cache[pos], &st, 0) & DATA_CHANGED)
87 return 0;
90 return 1;
93 static int for_each_remote_ref_submodule(const char *submodule,
94 each_ref_fn fn, void *cb_data)
96 return refs_for_each_remote_ref(get_submodule_ref_store(submodule),
97 fn, cb_data);
101 * Try to update the "path" entry in the "submodule.<name>" section of the
102 * .gitmodules file. Return 0 only if a .gitmodules file was found, a section
103 * with the correct path=<oldpath> setting was found and we could update it.
105 int update_path_in_gitmodules(const char *oldpath, const char *newpath)
107 struct strbuf entry = STRBUF_INIT;
108 const struct submodule *submodule;
109 int ret;
111 if (!file_exists(GITMODULES_FILE)) /* Do nothing without .gitmodules */
112 return -1;
114 if (is_gitmodules_unmerged(the_repository->index))
115 die(_("Cannot change unmerged .gitmodules, resolve merge conflicts first"));
117 submodule = submodule_from_path(the_repository, null_oid(), oldpath);
118 if (!submodule || !submodule->name) {
119 warning(_("Could not find section in .gitmodules where path=%s"), oldpath);
120 return -1;
122 strbuf_addstr(&entry, "submodule.");
123 strbuf_addstr(&entry, submodule->name);
124 strbuf_addstr(&entry, ".path");
125 ret = config_set_in_gitmodules_file_gently(entry.buf, newpath);
126 strbuf_release(&entry);
127 return ret;
131 * Try to remove the "submodule.<name>" section from .gitmodules where the given
132 * path is configured. Return 0 only if a .gitmodules file was found, a section
133 * with the correct path=<path> setting was found and we could remove it.
135 int remove_path_from_gitmodules(const char *path)
137 struct strbuf sect = STRBUF_INIT;
138 const struct submodule *submodule;
140 if (!file_exists(GITMODULES_FILE)) /* Do nothing without .gitmodules */
141 return -1;
143 if (is_gitmodules_unmerged(the_repository->index))
144 die(_("Cannot change unmerged .gitmodules, resolve merge conflicts first"));
146 submodule = submodule_from_path(the_repository, null_oid(), path);
147 if (!submodule || !submodule->name) {
148 warning(_("Could not find section in .gitmodules where path=%s"), path);
149 return -1;
151 strbuf_addstr(&sect, "submodule.");
152 strbuf_addstr(&sect, submodule->name);
153 if (git_config_rename_section_in_file(GITMODULES_FILE, sect.buf, NULL) < 0) {
154 /* Maybe the user already did that, don't error out here */
155 warning(_("Could not remove .gitmodules entry for %s"), path);
156 strbuf_release(&sect);
157 return -1;
159 strbuf_release(&sect);
160 return 0;
163 void stage_updated_gitmodules(struct index_state *istate)
165 if (add_file_to_index(istate, GITMODULES_FILE, 0))
166 die(_("staging updated .gitmodules failed"));
169 static struct string_list added_submodule_odb_paths = STRING_LIST_INIT_NODUP;
171 void add_submodule_odb_by_path(const char *path)
173 string_list_insert(&added_submodule_odb_paths, xstrdup(path));
176 int register_all_submodule_odb_as_alternates(void)
178 int i;
179 int ret = added_submodule_odb_paths.nr;
181 for (i = 0; i < added_submodule_odb_paths.nr; i++)
182 add_to_alternates_memory(added_submodule_odb_paths.items[i].string);
183 if (ret) {
184 string_list_clear(&added_submodule_odb_paths, 0);
185 trace2_data_intmax("submodule", the_repository,
186 "register_all_submodule_odb_as_alternates/registered", ret);
187 if (git_env_bool("GIT_TEST_FATAL_REGISTER_SUBMODULE_ODB", 0))
188 BUG("register_all_submodule_odb_as_alternates() called");
190 return ret;
193 void set_diffopt_flags_from_submodule_config(struct diff_options *diffopt,
194 const char *path)
196 const struct submodule *submodule = submodule_from_path(the_repository,
197 null_oid(),
198 path);
199 if (submodule) {
200 const char *ignore;
201 char *key;
203 key = xstrfmt("submodule.%s.ignore", submodule->name);
204 if (repo_config_get_string_tmp(the_repository, key, &ignore))
205 ignore = submodule->ignore;
206 free(key);
208 if (ignore)
209 handle_ignore_submodules_arg(diffopt, ignore);
210 else if (is_gitmodules_unmerged(the_repository->index))
211 diffopt->flags.ignore_submodules = 1;
215 /* Cheap function that only determines if we're interested in submodules at all */
216 int git_default_submodule_config(const char *var, const char *value,
217 void *cb UNUSED)
219 if (!strcmp(var, "submodule.recurse")) {
220 int v = git_config_bool(var, value) ?
221 RECURSE_SUBMODULES_ON : RECURSE_SUBMODULES_OFF;
222 config_update_recurse_submodules = v;
224 return 0;
227 int option_parse_recurse_submodules_worktree_updater(const struct option *opt,
228 const char *arg, int unset)
230 if (unset) {
231 config_update_recurse_submodules = RECURSE_SUBMODULES_OFF;
232 return 0;
234 if (arg)
235 config_update_recurse_submodules =
236 parse_update_recurse_submodules_arg(opt->long_name,
237 arg);
238 else
239 config_update_recurse_submodules = RECURSE_SUBMODULES_ON;
241 return 0;
245 * Determine if a submodule has been initialized at a given 'path'
248 * NEEDSWORK: Emit a warning if submodule.active exists, but is valueless,
249 * ie, the config looks like: "[submodule] active\n".
250 * Since that is an invalid pathspec, we should inform the user.
252 int is_tree_submodule_active(struct repository *repo,
253 const struct object_id *treeish_name,
254 const char *path)
256 int ret = 0;
257 char *key = NULL;
258 char *value = NULL;
259 const struct string_list *sl;
260 const struct submodule *module;
262 module = submodule_from_path(repo, treeish_name, path);
264 /* early return if there isn't a path->module mapping */
265 if (!module)
266 return 0;
268 /* submodule.<name>.active is set */
269 key = xstrfmt("submodule.%s.active", module->name);
270 if (!repo_config_get_bool(repo, key, &ret)) {
271 free(key);
272 return ret;
274 free(key);
276 /* submodule.active is set */
277 sl = repo_config_get_value_multi(repo, "submodule.active");
278 if (sl) {
279 struct pathspec ps;
280 struct strvec args = STRVEC_INIT;
281 const struct string_list_item *item;
283 for_each_string_list_item(item, sl) {
284 strvec_push(&args, item->string);
287 parse_pathspec(&ps, 0, 0, NULL, args.v);
288 ret = match_pathspec(repo->index, &ps, path, strlen(path), 0, NULL, 1);
290 strvec_clear(&args);
291 clear_pathspec(&ps);
292 return ret;
295 /* fallback to checking if the URL is set */
296 key = xstrfmt("submodule.%s.url", module->name);
297 ret = !repo_config_get_string(repo, key, &value);
299 free(value);
300 free(key);
301 return ret;
304 int is_submodule_active(struct repository *repo, const char *path)
306 return is_tree_submodule_active(repo, null_oid(), path);
309 int is_submodule_populated_gently(const char *path, int *return_error_code)
311 int ret = 0;
312 char *gitdir = xstrfmt("%s/.git", path);
314 if (resolve_gitdir_gently(gitdir, return_error_code))
315 ret = 1;
317 free(gitdir);
318 return ret;
322 * Dies if the provided 'prefix' corresponds to an unpopulated submodule
324 void die_in_unpopulated_submodule(struct index_state *istate,
325 const char *prefix)
327 int i, prefixlen;
329 if (!prefix)
330 return;
332 prefixlen = strlen(prefix);
334 for (i = 0; i < istate->cache_nr; i++) {
335 struct cache_entry *ce = istate->cache[i];
336 int ce_len = ce_namelen(ce);
338 if (!S_ISGITLINK(ce->ce_mode))
339 continue;
340 if (prefixlen <= ce_len)
341 continue;
342 if (strncmp(ce->name, prefix, ce_len))
343 continue;
344 if (prefix[ce_len] != '/')
345 continue;
347 die(_("in unpopulated submodule '%s'"), ce->name);
352 * Dies if any paths in the provided pathspec descends into a submodule
354 void die_path_inside_submodule(struct index_state *istate,
355 const struct pathspec *ps)
357 int i, j;
359 for (i = 0; i < istate->cache_nr; i++) {
360 struct cache_entry *ce = istate->cache[i];
361 int ce_len = ce_namelen(ce);
363 if (!S_ISGITLINK(ce->ce_mode))
364 continue;
366 for (j = 0; j < ps->nr ; j++) {
367 const struct pathspec_item *item = &ps->items[j];
369 if (item->len <= ce_len)
370 continue;
371 if (item->match[ce_len] != '/')
372 continue;
373 if (strncmp(ce->name, item->match, ce_len))
374 continue;
375 if (item->len == ce_len + 1)
376 continue;
378 die(_("Pathspec '%s' is in submodule '%.*s'"),
379 item->original, ce_len, ce->name);
384 enum submodule_update_type parse_submodule_update_type(const char *value)
386 if (!strcmp(value, "none"))
387 return SM_UPDATE_NONE;
388 else if (!strcmp(value, "checkout"))
389 return SM_UPDATE_CHECKOUT;
390 else if (!strcmp(value, "rebase"))
391 return SM_UPDATE_REBASE;
392 else if (!strcmp(value, "merge"))
393 return SM_UPDATE_MERGE;
394 else if (*value == '!')
395 return SM_UPDATE_COMMAND;
396 else
397 return SM_UPDATE_UNSPECIFIED;
400 int parse_submodule_update_strategy(const char *value,
401 struct submodule_update_strategy *dst)
403 enum submodule_update_type type;
405 free((void*)dst->command);
406 dst->command = NULL;
408 type = parse_submodule_update_type(value);
409 if (type == SM_UPDATE_UNSPECIFIED)
410 return -1;
412 dst->type = type;
413 if (type == SM_UPDATE_COMMAND)
414 dst->command = xstrdup(value + 1);
416 return 0;
419 const char *submodule_update_type_to_string(enum submodule_update_type type)
421 switch (type) {
422 case SM_UPDATE_CHECKOUT:
423 return "checkout";
424 case SM_UPDATE_MERGE:
425 return "merge";
426 case SM_UPDATE_REBASE:
427 return "rebase";
428 case SM_UPDATE_NONE:
429 return "none";
430 case SM_UPDATE_UNSPECIFIED:
431 case SM_UPDATE_COMMAND:
432 BUG("init_submodule() should handle type %d", type);
433 default:
434 BUG("unexpected update strategy type: %d", type);
438 void handle_ignore_submodules_arg(struct diff_options *diffopt,
439 const char *arg)
441 diffopt->flags.ignore_submodule_set = 1;
442 diffopt->flags.ignore_submodules = 0;
443 diffopt->flags.ignore_untracked_in_submodules = 0;
444 diffopt->flags.ignore_dirty_submodules = 0;
446 if (!strcmp(arg, "all"))
447 diffopt->flags.ignore_submodules = 1;
448 else if (!strcmp(arg, "untracked"))
449 diffopt->flags.ignore_untracked_in_submodules = 1;
450 else if (!strcmp(arg, "dirty"))
451 diffopt->flags.ignore_dirty_submodules = 1;
452 else if (strcmp(arg, "none"))
453 die(_("bad --ignore-submodules argument: %s"), arg);
455 * Please update _git_status() in git-completion.bash when you
456 * add new options
460 static int prepare_submodule_diff_summary(struct repository *r, struct rev_info *rev,
461 const char *path,
462 struct commit *left, struct commit *right,
463 struct commit_list *merge_bases)
465 struct commit_list *list;
467 repo_init_revisions(r, rev, NULL);
468 setup_revisions(0, NULL, rev, NULL);
469 rev->left_right = 1;
470 rev->first_parent_only = 1;
471 left->object.flags |= SYMMETRIC_LEFT;
472 add_pending_object(rev, &left->object, path);
473 add_pending_object(rev, &right->object, path);
474 for (list = merge_bases; list; list = list->next) {
475 list->item->object.flags |= UNINTERESTING;
476 add_pending_object(rev, &list->item->object,
477 oid_to_hex(&list->item->object.oid));
479 return prepare_revision_walk(rev);
482 static void print_submodule_diff_summary(struct repository *r, struct rev_info *rev, struct diff_options *o)
484 static const char format[] = " %m %s";
485 struct strbuf sb = STRBUF_INIT;
486 struct commit *commit;
488 while ((commit = get_revision(rev))) {
489 struct pretty_print_context ctx = {0};
490 ctx.date_mode = rev->date_mode;
491 ctx.output_encoding = get_log_output_encoding();
492 strbuf_setlen(&sb, 0);
493 repo_format_commit_message(r, commit, format, &sb,
494 &ctx);
495 strbuf_addch(&sb, '\n');
496 if (commit->object.flags & SYMMETRIC_LEFT)
497 diff_emit_submodule_del(o, sb.buf);
498 else
499 diff_emit_submodule_add(o, sb.buf);
501 strbuf_release(&sb);
504 void prepare_submodule_repo_env(struct strvec *out)
506 prepare_other_repo_env(out, DEFAULT_GIT_DIR_ENVIRONMENT);
509 static void prepare_submodule_repo_env_in_gitdir(struct strvec *out)
511 prepare_other_repo_env(out, ".");
515 * Initialize a repository struct for a submodule based on the provided 'path'.
517 * Returns the repository struct on success,
518 * NULL when the submodule is not present.
520 static struct repository *open_submodule(const char *path)
522 struct strbuf sb = STRBUF_INIT;
523 struct repository *out = xmalloc(sizeof(*out));
525 if (submodule_to_gitdir(&sb, path) || repo_init(out, sb.buf, NULL)) {
526 strbuf_release(&sb);
527 free(out);
528 return NULL;
531 /* Mark it as a submodule */
532 out->submodule_prefix = xstrdup(path);
534 strbuf_release(&sb);
535 return out;
539 * Helper function to display the submodule header line prior to the full
540 * summary output.
542 * If it can locate the submodule git directory it will create a repository
543 * handle for the submodule and lookup both the left and right commits and
544 * put them into the left and right pointers.
546 static void show_submodule_header(struct diff_options *o,
547 const char *path,
548 struct object_id *one, struct object_id *two,
549 unsigned dirty_submodule,
550 struct repository *sub,
551 struct commit **left, struct commit **right,
552 struct commit_list **merge_bases)
554 const char *message = NULL;
555 struct strbuf sb = STRBUF_INIT;
556 int fast_forward = 0, fast_backward = 0;
558 if (dirty_submodule & DIRTY_SUBMODULE_UNTRACKED)
559 diff_emit_submodule_untracked(o, path);
561 if (dirty_submodule & DIRTY_SUBMODULE_MODIFIED)
562 diff_emit_submodule_modified(o, path);
564 if (is_null_oid(one))
565 message = "(new submodule)";
566 else if (is_null_oid(two))
567 message = "(submodule deleted)";
569 if (!sub) {
570 if (!message)
571 message = "(commits not present)";
572 goto output_header;
576 * Attempt to lookup the commit references, and determine if this is
577 * a fast forward or fast backwards update.
579 *left = lookup_commit_reference(sub, one);
580 *right = lookup_commit_reference(sub, two);
583 * Warn about missing commits in the submodule project, but only if
584 * they aren't null.
586 if ((!is_null_oid(one) && !*left) ||
587 (!is_null_oid(two) && !*right))
588 message = "(commits not present)";
590 *merge_bases = repo_get_merge_bases(sub, *left, *right);
591 if (*merge_bases) {
592 if ((*merge_bases)->item == *left)
593 fast_forward = 1;
594 else if ((*merge_bases)->item == *right)
595 fast_backward = 1;
598 if (oideq(one, two)) {
599 strbuf_release(&sb);
600 return;
603 output_header:
604 strbuf_addf(&sb, "Submodule %s ", path);
605 strbuf_add_unique_abbrev(&sb, one, DEFAULT_ABBREV);
606 strbuf_addstr(&sb, (fast_backward || fast_forward) ? ".." : "...");
607 strbuf_add_unique_abbrev(&sb, two, DEFAULT_ABBREV);
608 if (message)
609 strbuf_addf(&sb, " %s\n", message);
610 else
611 strbuf_addf(&sb, "%s:\n", fast_backward ? " (rewind)" : "");
612 diff_emit_submodule_header(o, sb.buf);
614 strbuf_release(&sb);
617 void show_submodule_diff_summary(struct diff_options *o, const char *path,
618 struct object_id *one, struct object_id *two,
619 unsigned dirty_submodule)
621 struct rev_info rev = REV_INFO_INIT;
622 struct commit *left = NULL, *right = NULL;
623 struct commit_list *merge_bases = NULL;
624 struct repository *sub;
626 sub = open_submodule(path);
627 show_submodule_header(o, path, one, two, dirty_submodule,
628 sub, &left, &right, &merge_bases);
631 * If we don't have both a left and a right pointer, there is no
632 * reason to try and display a summary. The header line should contain
633 * all the information the user needs.
635 if (!left || !right || !sub)
636 goto out;
638 /* Treat revision walker failure the same as missing commits */
639 if (prepare_submodule_diff_summary(sub, &rev, path, left, right, merge_bases)) {
640 diff_emit_submodule_error(o, "(revision walker failed)\n");
641 goto out;
644 print_submodule_diff_summary(sub, &rev, o);
646 out:
647 free_commit_list(merge_bases);
648 release_revisions(&rev);
649 clear_commit_marks(left, ~0);
650 clear_commit_marks(right, ~0);
651 if (sub) {
652 repo_clear(sub);
653 free(sub);
657 void show_submodule_inline_diff(struct diff_options *o, const char *path,
658 struct object_id *one, struct object_id *two,
659 unsigned dirty_submodule)
661 const struct object_id *old_oid = the_hash_algo->empty_tree, *new_oid = the_hash_algo->empty_tree;
662 struct commit *left = NULL, *right = NULL;
663 struct commit_list *merge_bases = NULL;
664 struct child_process cp = CHILD_PROCESS_INIT;
665 struct strbuf sb = STRBUF_INIT;
666 struct repository *sub;
668 sub = open_submodule(path);
669 show_submodule_header(o, path, one, two, dirty_submodule,
670 sub, &left, &right, &merge_bases);
672 /* We need a valid left and right commit to display a difference */
673 if (!(left || is_null_oid(one)) ||
674 !(right || is_null_oid(two)))
675 goto done;
677 if (left)
678 old_oid = one;
679 if (right)
680 new_oid = two;
682 cp.git_cmd = 1;
683 cp.dir = path;
684 cp.out = -1;
685 cp.no_stdin = 1;
687 /* TODO: other options may need to be passed here. */
688 strvec_pushl(&cp.args, "diff", "--submodule=diff", NULL);
689 strvec_pushf(&cp.args, "--color=%s", want_color(o->use_color) ?
690 "always" : "never");
692 if (o->flags.reverse_diff) {
693 strvec_pushf(&cp.args, "--src-prefix=%s%s/",
694 o->b_prefix, path);
695 strvec_pushf(&cp.args, "--dst-prefix=%s%s/",
696 o->a_prefix, path);
697 } else {
698 strvec_pushf(&cp.args, "--src-prefix=%s%s/",
699 o->a_prefix, path);
700 strvec_pushf(&cp.args, "--dst-prefix=%s%s/",
701 o->b_prefix, path);
703 strvec_push(&cp.args, oid_to_hex(old_oid));
705 * If the submodule has modified content, we will diff against the
706 * work tree, under the assumption that the user has asked for the
707 * diff format and wishes to actually see all differences even if they
708 * haven't yet been committed to the submodule yet.
710 if (!(dirty_submodule & DIRTY_SUBMODULE_MODIFIED))
711 strvec_push(&cp.args, oid_to_hex(new_oid));
713 prepare_submodule_repo_env(&cp.env);
715 if (!is_directory(path)) {
716 /* fall back to absorbed git dir, if any */
717 if (!sub)
718 goto done;
719 cp.dir = sub->gitdir;
720 strvec_push(&cp.env, GIT_DIR_ENVIRONMENT "=.");
721 strvec_push(&cp.env, GIT_WORK_TREE_ENVIRONMENT "=.");
724 if (start_command(&cp)) {
725 diff_emit_submodule_error(o, "(diff failed)\n");
726 goto done;
729 while (strbuf_getwholeline_fd(&sb, cp.out, '\n') != EOF)
730 diff_emit_submodule_pipethrough(o, sb.buf, sb.len);
732 if (finish_command(&cp))
733 diff_emit_submodule_error(o, "(diff failed)\n");
735 done:
736 strbuf_release(&sb);
737 free_commit_list(merge_bases);
738 if (left)
739 clear_commit_marks(left, ~0);
740 if (right)
741 clear_commit_marks(right, ~0);
742 if (sub) {
743 repo_clear(sub);
744 free(sub);
748 int should_update_submodules(void)
750 return config_update_recurse_submodules == RECURSE_SUBMODULES_ON;
753 const struct submodule *submodule_from_ce(const struct cache_entry *ce)
755 if (!S_ISGITLINK(ce->ce_mode))
756 return NULL;
758 if (!should_update_submodules())
759 return NULL;
761 return submodule_from_path(the_repository, null_oid(), ce->name);
765 struct collect_changed_submodules_cb_data {
766 struct repository *repo;
767 struct string_list *changed;
768 const struct object_id *commit_oid;
772 * this would normally be two functions: default_name_from_path() and
773 * path_from_default_name(). Since the default name is the same as
774 * the submodule path we can get away with just one function which only
775 * checks whether there is a submodule in the working directory at that
776 * location.
778 static const char *default_name_or_path(const char *path_or_name)
780 int error_code;
782 if (!is_submodule_populated_gently(path_or_name, &error_code))
783 return NULL;
785 return path_or_name;
789 * Holds relevant information for a changed submodule. Used as the .util
790 * member of the changed submodule name string_list_item.
792 * (super_oid, path) allows the submodule config to be read from _some_
793 * .gitmodules file. We store this information the first time we find a
794 * superproject commit that points to the submodule, but this is
795 * arbitrary - we can choose any (super_oid, path) that matches the
796 * submodule's name.
798 * NEEDSWORK: Storing an arbitrary commit is undesirable because we can't
799 * guarantee that we're reading the commit that the user would expect. A better
800 * scheme would be to just fetch a submodule by its name. This requires two
801 * steps:
802 * - Create a function that behaves like repo_submodule_init(), but accepts a
803 * submodule name instead of treeish_name and path. This should be easy
804 * because repo_submodule_init() internally uses the submodule's name.
806 * - Replace most instances of 'struct submodule' (which is the .gitmodules
807 * config) with just the submodule name. This is OK because we expect
808 * submodule settings to be stored in .git/config (via "git submodule init"),
809 * not .gitmodules. This also lets us delete get_non_gitmodules_submodule(),
810 * which constructs a bogus 'struct submodule' for the sake of giving a
811 * placeholder name to a gitlink.
813 struct changed_submodule_data {
815 * The first superproject commit in the rev walk that points to
816 * the submodule.
818 const struct object_id *super_oid;
820 * Path to the submodule in the superproject commit referenced
821 * by 'super_oid'.
823 char *path;
824 /* The submodule commits that have changed in the rev walk. */
825 struct oid_array new_commits;
828 static void changed_submodule_data_clear(struct changed_submodule_data *cs_data)
830 oid_array_clear(&cs_data->new_commits);
831 free(cs_data->path);
834 static void collect_changed_submodules_cb(struct diff_queue_struct *q,
835 struct diff_options *options,
836 void *data)
838 struct collect_changed_submodules_cb_data *me = data;
839 struct string_list *changed = me->changed;
840 const struct object_id *commit_oid = me->commit_oid;
841 int i;
843 for (i = 0; i < q->nr; i++) {
844 struct diff_filepair *p = q->queue[i];
845 const struct submodule *submodule;
846 const char *name;
847 struct string_list_item *item;
848 struct changed_submodule_data *cs_data;
850 if (!S_ISGITLINK(p->two->mode))
851 continue;
853 submodule = submodule_from_path(me->repo,
854 commit_oid, p->two->path);
855 if (submodule)
856 name = submodule->name;
857 else {
858 name = default_name_or_path(p->two->path);
859 /* make sure name does not collide with existing one */
860 if (name)
861 submodule = submodule_from_name(me->repo,
862 commit_oid, name);
863 if (submodule) {
864 warning(_("Submodule in commit %s at path: "
865 "'%s' collides with a submodule named "
866 "the same. Skipping it."),
867 oid_to_hex(commit_oid), p->two->path);
868 name = NULL;
872 if (!name)
873 continue;
875 item = string_list_insert(changed, name);
876 if (item->util)
877 cs_data = item->util;
878 else {
879 item->util = xcalloc(1, sizeof(struct changed_submodule_data));
880 cs_data = item->util;
881 cs_data->super_oid = commit_oid;
882 cs_data->path = xstrdup(p->two->path);
884 oid_array_append(&cs_data->new_commits, &p->two->oid);
889 * Collect the paths of submodules in 'changed' which have changed based on
890 * the revisions as specified in 'argv'. Each entry in 'changed' will also
891 * have a corresponding 'struct oid_array' (in the 'util' field) which lists
892 * what the submodule pointers were updated to during the change.
894 static void collect_changed_submodules(struct repository *r,
895 struct string_list *changed,
896 struct strvec *argv)
898 struct rev_info rev;
899 const struct commit *commit;
900 int save_warning;
901 struct setup_revision_opt s_r_opt = {
902 .assume_dashdash = 1,
905 save_warning = warn_on_object_refname_ambiguity;
906 warn_on_object_refname_ambiguity = 0;
907 repo_init_revisions(r, &rev, NULL);
908 setup_revisions(argv->nr, argv->v, &rev, &s_r_opt);
909 warn_on_object_refname_ambiguity = save_warning;
910 if (prepare_revision_walk(&rev))
911 die(_("revision walk setup failed"));
913 while ((commit = get_revision(&rev))) {
914 struct rev_info diff_rev;
915 struct collect_changed_submodules_cb_data data;
916 data.repo = r;
917 data.changed = changed;
918 data.commit_oid = &commit->object.oid;
920 repo_init_revisions(r, &diff_rev, NULL);
921 diff_rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
922 diff_rev.diffopt.format_callback = collect_changed_submodules_cb;
923 diff_rev.diffopt.format_callback_data = &data;
924 diff_rev.dense_combined_merges = 1;
925 diff_tree_combined_merge(commit, &diff_rev);
926 release_revisions(&diff_rev);
929 reset_revision_walk();
930 release_revisions(&rev);
933 static void free_submodules_data(struct string_list *submodules)
935 struct string_list_item *item;
936 for_each_string_list_item(item, submodules)
937 changed_submodule_data_clear(item->util);
939 string_list_clear(submodules, 1);
942 static int has_remote(const char *refname UNUSED,
943 const struct object_id *oid UNUSED,
944 int flags UNUSED, void *cb_data UNUSED)
946 return 1;
949 static int append_oid_to_argv(const struct object_id *oid, void *data)
951 struct strvec *argv = data;
952 strvec_push(argv, oid_to_hex(oid));
953 return 0;
956 struct has_commit_data {
957 struct repository *repo;
958 int result;
959 const char *path;
960 const struct object_id *super_oid;
963 static int check_has_commit(const struct object_id *oid, void *data)
965 struct has_commit_data *cb = data;
966 struct repository subrepo;
967 enum object_type type;
969 if (repo_submodule_init(&subrepo, cb->repo, cb->path, cb->super_oid)) {
970 cb->result = 0;
971 /* subrepo failed to init, so don't clean it up. */
972 return 0;
975 type = oid_object_info(&subrepo, oid, NULL);
977 switch (type) {
978 case OBJ_COMMIT:
979 goto cleanup;
980 case OBJ_BAD:
982 * Object is missing or invalid. If invalid, an error message
983 * has already been printed.
985 cb->result = 0;
986 goto cleanup;
987 default:
988 die(_("submodule entry '%s' (%s) is a %s, not a commit"),
989 cb->path, oid_to_hex(oid), type_name(type));
991 cleanup:
992 repo_clear(&subrepo);
993 return 0;
996 static int submodule_has_commits(struct repository *r,
997 const char *path,
998 const struct object_id *super_oid,
999 struct oid_array *commits)
1001 struct has_commit_data has_commit = {
1002 .repo = r,
1003 .result = 1,
1004 .path = path,
1005 .super_oid = super_oid
1008 oid_array_for_each_unique(commits, check_has_commit, &has_commit);
1010 if (has_commit.result) {
1012 * Even if the submodule is checked out and the commit is
1013 * present, make sure it exists in the submodule's object store
1014 * and that it is reachable from a ref.
1016 struct child_process cp = CHILD_PROCESS_INIT;
1017 struct strbuf out = STRBUF_INIT;
1019 strvec_pushl(&cp.args, "rev-list", "-n", "1", NULL);
1020 oid_array_for_each_unique(commits, append_oid_to_argv, &cp.args);
1021 strvec_pushl(&cp.args, "--not", "--all", NULL);
1023 prepare_submodule_repo_env(&cp.env);
1024 cp.git_cmd = 1;
1025 cp.no_stdin = 1;
1026 cp.dir = path;
1028 if (capture_command(&cp, &out, GIT_MAX_HEXSZ + 1) || out.len)
1029 has_commit.result = 0;
1031 strbuf_release(&out);
1034 return has_commit.result;
1037 static int submodule_needs_pushing(struct repository *r,
1038 const char *path,
1039 struct oid_array *commits)
1041 if (!submodule_has_commits(r, path, null_oid(), commits))
1043 * NOTE: We do consider it safe to return "no" here. The
1044 * correct answer would be "We do not know" instead of
1045 * "No push needed", but it is quite hard to change
1046 * the submodule pointer without having the submodule
1047 * around. If a user did however change the submodules
1048 * without having the submodule around, this indicates
1049 * an expert who knows what they are doing or a
1050 * maintainer integrating work from other people. In
1051 * both cases it should be safe to skip this check.
1053 return 0;
1055 if (for_each_remote_ref_submodule(path, has_remote, NULL) > 0) {
1056 struct child_process cp = CHILD_PROCESS_INIT;
1057 struct strbuf buf = STRBUF_INIT;
1058 int needs_pushing = 0;
1060 strvec_push(&cp.args, "rev-list");
1061 oid_array_for_each_unique(commits, append_oid_to_argv, &cp.args);
1062 strvec_pushl(&cp.args, "--not", "--remotes", "-n", "1" , NULL);
1064 prepare_submodule_repo_env(&cp.env);
1065 cp.git_cmd = 1;
1066 cp.no_stdin = 1;
1067 cp.out = -1;
1068 cp.dir = path;
1069 if (start_command(&cp))
1070 die(_("Could not run 'git rev-list <commits> --not --remotes -n 1' command in submodule %s"),
1071 path);
1072 if (strbuf_read(&buf, cp.out, the_hash_algo->hexsz + 1))
1073 needs_pushing = 1;
1074 finish_command(&cp);
1075 close(cp.out);
1076 strbuf_release(&buf);
1077 return needs_pushing;
1080 return 0;
1083 int find_unpushed_submodules(struct repository *r,
1084 struct oid_array *commits,
1085 const char *remotes_name,
1086 struct string_list *needs_pushing)
1088 struct string_list submodules = STRING_LIST_INIT_DUP;
1089 struct string_list_item *name;
1090 struct strvec argv = STRVEC_INIT;
1092 /* argv.v[0] will be ignored by setup_revisions */
1093 strvec_push(&argv, "find_unpushed_submodules");
1094 oid_array_for_each_unique(commits, append_oid_to_argv, &argv);
1095 strvec_push(&argv, "--not");
1096 strvec_pushf(&argv, "--remotes=%s", remotes_name);
1098 collect_changed_submodules(r, &submodules, &argv);
1100 for_each_string_list_item(name, &submodules) {
1101 struct changed_submodule_data *cs_data = name->util;
1102 const struct submodule *submodule;
1103 const char *path = NULL;
1105 submodule = submodule_from_name(r, null_oid(), name->string);
1106 if (submodule)
1107 path = submodule->path;
1108 else
1109 path = default_name_or_path(name->string);
1111 if (!path)
1112 continue;
1114 if (submodule_needs_pushing(r, path, &cs_data->new_commits))
1115 string_list_insert(needs_pushing, path);
1118 free_submodules_data(&submodules);
1119 strvec_clear(&argv);
1121 return needs_pushing->nr;
1124 static int push_submodule(const char *path,
1125 const struct remote *remote,
1126 const struct refspec *rs,
1127 const struct string_list *push_options,
1128 int dry_run)
1130 if (for_each_remote_ref_submodule(path, has_remote, NULL) > 0) {
1131 struct child_process cp = CHILD_PROCESS_INIT;
1132 strvec_push(&cp.args, "push");
1133 if (dry_run)
1134 strvec_push(&cp.args, "--dry-run");
1136 if (push_options && push_options->nr) {
1137 const struct string_list_item *item;
1138 for_each_string_list_item(item, push_options)
1139 strvec_pushf(&cp.args, "--push-option=%s",
1140 item->string);
1143 if (remote->origin != REMOTE_UNCONFIGURED) {
1144 int i;
1145 strvec_push(&cp.args, remote->name);
1146 for (i = 0; i < rs->raw_nr; i++)
1147 strvec_push(&cp.args, rs->raw[i]);
1150 prepare_submodule_repo_env(&cp.env);
1151 cp.git_cmd = 1;
1152 cp.no_stdin = 1;
1153 cp.dir = path;
1154 if (run_command(&cp))
1155 return 0;
1156 close(cp.out);
1159 return 1;
1163 * Perform a check in the submodule to see if the remote and refspec work.
1164 * Die if the submodule can't be pushed.
1166 static void submodule_push_check(const char *path, const char *head,
1167 const struct remote *remote,
1168 const struct refspec *rs)
1170 struct child_process cp = CHILD_PROCESS_INIT;
1171 int i;
1173 strvec_push(&cp.args, "submodule--helper");
1174 strvec_push(&cp.args, "push-check");
1175 strvec_push(&cp.args, head);
1176 strvec_push(&cp.args, remote->name);
1178 for (i = 0; i < rs->raw_nr; i++)
1179 strvec_push(&cp.args, rs->raw[i]);
1181 prepare_submodule_repo_env(&cp.env);
1182 cp.git_cmd = 1;
1183 cp.no_stdin = 1;
1184 cp.no_stdout = 1;
1185 cp.dir = path;
1188 * Simply indicate if 'submodule--helper push-check' failed.
1189 * More detailed error information will be provided by the
1190 * child process.
1192 if (run_command(&cp))
1193 die(_("process for submodule '%s' failed"), path);
1196 int push_unpushed_submodules(struct repository *r,
1197 struct oid_array *commits,
1198 const struct remote *remote,
1199 const struct refspec *rs,
1200 const struct string_list *push_options,
1201 int dry_run)
1203 int i, ret = 1;
1204 struct string_list needs_pushing = STRING_LIST_INIT_DUP;
1206 if (!find_unpushed_submodules(r, commits,
1207 remote->name, &needs_pushing))
1208 return 1;
1211 * Verify that the remote and refspec can be propagated to all
1212 * submodules. This check can be skipped if the remote and refspec
1213 * won't be propagated due to the remote being unconfigured (e.g. a URL
1214 * instead of a remote name).
1216 if (remote->origin != REMOTE_UNCONFIGURED) {
1217 char *head;
1218 struct object_id head_oid;
1220 head = resolve_refdup("HEAD", 0, &head_oid, NULL);
1221 if (!head)
1222 die(_("Failed to resolve HEAD as a valid ref."));
1224 for (i = 0; i < needs_pushing.nr; i++)
1225 submodule_push_check(needs_pushing.items[i].string,
1226 head, remote, rs);
1227 free(head);
1230 /* Actually push the submodules */
1231 for (i = 0; i < needs_pushing.nr; i++) {
1232 const char *path = needs_pushing.items[i].string;
1233 fprintf(stderr, _("Pushing submodule '%s'\n"), path);
1234 if (!push_submodule(path, remote, rs,
1235 push_options, dry_run)) {
1236 fprintf(stderr, _("Unable to push submodule '%s'\n"), path);
1237 ret = 0;
1241 string_list_clear(&needs_pushing, 0);
1243 return ret;
1246 static int append_oid_to_array(const char *ref UNUSED,
1247 const struct object_id *oid,
1248 int flags UNUSED, void *data)
1250 struct oid_array *array = data;
1251 oid_array_append(array, oid);
1252 return 0;
1255 void check_for_new_submodule_commits(struct object_id *oid)
1257 if (!initialized_fetch_ref_tips) {
1258 for_each_ref(append_oid_to_array, &ref_tips_before_fetch);
1259 initialized_fetch_ref_tips = 1;
1262 oid_array_append(&ref_tips_after_fetch, oid);
1266 * Returns 1 if there is at least one submodule gitdir in
1267 * $GIT_DIR/modules and 0 otherwise. This follows
1268 * submodule_name_to_gitdir(), which looks for submodules in
1269 * $GIT_DIR/modules, not $GIT_COMMON_DIR.
1271 * A submodule can be moved to $GIT_DIR/modules manually by running "git
1272 * submodule absorbgitdirs", or it may be initialized there by "git
1273 * submodule update".
1275 static int repo_has_absorbed_submodules(struct repository *r)
1277 int ret;
1278 struct strbuf buf = STRBUF_INIT;
1280 strbuf_repo_git_path(&buf, r, "modules/");
1281 ret = file_exists(buf.buf) && !is_empty_dir(buf.buf);
1282 strbuf_release(&buf);
1283 return ret;
1286 static void calculate_changed_submodule_paths(struct repository *r,
1287 struct string_list *changed_submodule_names)
1289 struct strvec argv = STRVEC_INIT;
1290 struct string_list_item *name;
1292 /* No need to check if no submodules would be fetched */
1293 if (!submodule_from_path(r, NULL, NULL) &&
1294 !repo_has_absorbed_submodules(r))
1295 return;
1297 strvec_push(&argv, "--"); /* argv[0] program name */
1298 oid_array_for_each_unique(&ref_tips_after_fetch,
1299 append_oid_to_argv, &argv);
1300 strvec_push(&argv, "--not");
1301 oid_array_for_each_unique(&ref_tips_before_fetch,
1302 append_oid_to_argv, &argv);
1305 * Collect all submodules (whether checked out or not) for which new
1306 * commits have been recorded upstream in "changed_submodule_names".
1308 collect_changed_submodules(r, changed_submodule_names, &argv);
1310 for_each_string_list_item(name, changed_submodule_names) {
1311 struct changed_submodule_data *cs_data = name->util;
1312 const struct submodule *submodule;
1313 const char *path = NULL;
1315 submodule = submodule_from_name(r, null_oid(), name->string);
1316 if (submodule)
1317 path = submodule->path;
1318 else
1319 path = default_name_or_path(name->string);
1321 if (!path)
1322 continue;
1324 if (submodule_has_commits(r, path, null_oid(), &cs_data->new_commits)) {
1325 changed_submodule_data_clear(cs_data);
1326 *name->string = '\0';
1330 string_list_remove_empty_items(changed_submodule_names, 1);
1332 strvec_clear(&argv);
1333 oid_array_clear(&ref_tips_before_fetch);
1334 oid_array_clear(&ref_tips_after_fetch);
1335 initialized_fetch_ref_tips = 0;
1338 int submodule_touches_in_range(struct repository *r,
1339 struct object_id *excl_oid,
1340 struct object_id *incl_oid)
1342 struct string_list subs = STRING_LIST_INIT_DUP;
1343 struct strvec args = STRVEC_INIT;
1344 int ret;
1346 /* No need to check if there are no submodules configured */
1347 if (!submodule_from_path(r, NULL, NULL))
1348 return 0;
1350 strvec_push(&args, "--"); /* args[0] program name */
1351 strvec_push(&args, oid_to_hex(incl_oid));
1352 if (!is_null_oid(excl_oid)) {
1353 strvec_push(&args, "--not");
1354 strvec_push(&args, oid_to_hex(excl_oid));
1357 collect_changed_submodules(r, &subs, &args);
1358 ret = subs.nr;
1360 strvec_clear(&args);
1362 free_submodules_data(&subs);
1363 return ret;
1366 struct submodule_parallel_fetch {
1368 * The index of the last index entry processed by
1369 * get_fetch_task_from_index().
1371 int index_count;
1373 * The index of the last string_list entry processed by
1374 * get_fetch_task_from_changed().
1376 int changed_count;
1377 struct strvec args;
1378 struct repository *r;
1379 const char *prefix;
1380 int command_line_option;
1381 int default_option;
1382 int quiet;
1383 int result;
1386 * Names of submodules that have new commits. Generated by
1387 * walking the newly fetched superproject commits.
1389 struct string_list changed_submodule_names;
1391 * Names of submodules that have already been processed. Lets us
1392 * avoid fetching the same submodule more than once.
1394 struct string_list seen_submodule_names;
1396 /* Pending fetches by OIDs */
1397 struct fetch_task **oid_fetch_tasks;
1398 int oid_fetch_tasks_nr, oid_fetch_tasks_alloc;
1400 struct strbuf submodules_with_errors;
1402 #define SPF_INIT { \
1403 .args = STRVEC_INIT, \
1404 .changed_submodule_names = STRING_LIST_INIT_DUP, \
1405 .seen_submodule_names = STRING_LIST_INIT_DUP, \
1406 .submodules_with_errors = STRBUF_INIT, \
1409 static int get_fetch_recurse_config(const struct submodule *submodule,
1410 struct submodule_parallel_fetch *spf)
1412 if (spf->command_line_option != RECURSE_SUBMODULES_DEFAULT)
1413 return spf->command_line_option;
1415 if (submodule) {
1416 char *key;
1417 const char *value;
1419 int fetch_recurse = submodule->fetch_recurse;
1420 key = xstrfmt("submodule.%s.fetchRecurseSubmodules", submodule->name);
1421 if (!repo_config_get_string_tmp(spf->r, key, &value)) {
1422 fetch_recurse = parse_fetch_recurse_submodules_arg(key, value);
1424 free(key);
1426 if (fetch_recurse != RECURSE_SUBMODULES_NONE)
1427 /* local config overrules everything except commandline */
1428 return fetch_recurse;
1431 return spf->default_option;
1435 * Fetch in progress (if callback data) or
1436 * pending (if in oid_fetch_tasks in struct submodule_parallel_fetch)
1438 struct fetch_task {
1439 struct repository *repo;
1440 const struct submodule *sub;
1441 unsigned free_sub : 1; /* Do we need to free the submodule? */
1442 const char *default_argv; /* The default fetch mode. */
1443 struct strvec git_args; /* Args for the child git process. */
1445 struct oid_array *commits; /* Ensure these commits are fetched */
1449 * When a submodule is not defined in .gitmodules, we cannot access it
1450 * via the regular submodule-config. Create a fake submodule, which we can
1451 * work on.
1453 static const struct submodule *get_non_gitmodules_submodule(const char *path)
1455 struct submodule *ret = NULL;
1456 const char *name = default_name_or_path(path);
1458 if (!name)
1459 return NULL;
1461 ret = xmalloc(sizeof(*ret));
1462 memset(ret, 0, sizeof(*ret));
1463 ret->path = name;
1464 ret->name = name;
1466 return (const struct submodule *) ret;
1469 static void fetch_task_release(struct fetch_task *p)
1471 if (p->free_sub)
1472 free((void*)p->sub);
1473 p->free_sub = 0;
1474 p->sub = NULL;
1476 if (p->repo)
1477 repo_clear(p->repo);
1478 FREE_AND_NULL(p->repo);
1480 strvec_clear(&p->git_args);
1483 static struct repository *get_submodule_repo_for(struct repository *r,
1484 const char *path,
1485 const struct object_id *treeish_name)
1487 struct repository *ret = xmalloc(sizeof(*ret));
1489 if (repo_submodule_init(ret, r, path, treeish_name)) {
1490 free(ret);
1491 return NULL;
1494 return ret;
1497 static struct fetch_task *fetch_task_create(struct submodule_parallel_fetch *spf,
1498 const char *path,
1499 const struct object_id *treeish_name)
1501 struct fetch_task *task = xmalloc(sizeof(*task));
1502 memset(task, 0, sizeof(*task));
1504 task->sub = submodule_from_path(spf->r, treeish_name, path);
1506 if (!task->sub) {
1508 * No entry in .gitmodules? Technically not a submodule,
1509 * but historically we supported repositories that happen to be
1510 * in-place where a gitlink is. Keep supporting them.
1512 task->sub = get_non_gitmodules_submodule(path);
1513 if (!task->sub)
1514 goto cleanup;
1516 task->free_sub = 1;
1519 if (string_list_lookup(&spf->seen_submodule_names, task->sub->name))
1520 goto cleanup;
1522 switch (get_fetch_recurse_config(task->sub, spf))
1524 default:
1525 case RECURSE_SUBMODULES_DEFAULT:
1526 case RECURSE_SUBMODULES_ON_DEMAND:
1527 if (!task->sub ||
1528 !string_list_lookup(
1529 &spf->changed_submodule_names,
1530 task->sub->name))
1531 goto cleanup;
1532 task->default_argv = "on-demand";
1533 break;
1534 case RECURSE_SUBMODULES_ON:
1535 task->default_argv = "yes";
1536 break;
1537 case RECURSE_SUBMODULES_OFF:
1538 goto cleanup;
1541 task->repo = get_submodule_repo_for(spf->r, path, treeish_name);
1543 return task;
1545 cleanup:
1546 fetch_task_release(task);
1547 free(task);
1548 return NULL;
1551 static struct fetch_task *
1552 get_fetch_task_from_index(struct submodule_parallel_fetch *spf,
1553 struct strbuf *err)
1555 for (; spf->index_count < spf->r->index->cache_nr; spf->index_count++) {
1556 const struct cache_entry *ce =
1557 spf->r->index->cache[spf->index_count];
1558 struct fetch_task *task;
1560 if (!S_ISGITLINK(ce->ce_mode))
1561 continue;
1563 task = fetch_task_create(spf, ce->name, null_oid());
1564 if (!task)
1565 continue;
1567 if (task->repo) {
1568 if (!spf->quiet)
1569 strbuf_addf(err, _("Fetching submodule %s%s\n"),
1570 spf->prefix, ce->name);
1572 spf->index_count++;
1573 return task;
1574 } else {
1575 struct strbuf empty_submodule_path = STRBUF_INIT;
1577 fetch_task_release(task);
1578 free(task);
1581 * An empty directory is normal,
1582 * the submodule is not initialized
1584 strbuf_addf(&empty_submodule_path, "%s/%s/",
1585 spf->r->worktree,
1586 ce->name);
1587 if (S_ISGITLINK(ce->ce_mode) &&
1588 !is_empty_dir(empty_submodule_path.buf)) {
1589 spf->result = 1;
1590 strbuf_addf(err,
1591 _("Could not access submodule '%s'\n"),
1592 ce->name);
1594 strbuf_release(&empty_submodule_path);
1597 return NULL;
1600 static struct fetch_task *
1601 get_fetch_task_from_changed(struct submodule_parallel_fetch *spf,
1602 struct strbuf *err)
1604 for (; spf->changed_count < spf->changed_submodule_names.nr;
1605 spf->changed_count++) {
1606 struct string_list_item item =
1607 spf->changed_submodule_names.items[spf->changed_count];
1608 struct changed_submodule_data *cs_data = item.util;
1609 struct fetch_task *task;
1611 if (!is_tree_submodule_active(spf->r, cs_data->super_oid,cs_data->path))
1612 continue;
1614 task = fetch_task_create(spf, cs_data->path,
1615 cs_data->super_oid);
1616 if (!task)
1617 continue;
1619 if (!task->repo) {
1620 strbuf_addf(err, _("Could not access submodule '%s' at commit %s\n"),
1621 cs_data->path,
1622 find_unique_abbrev(cs_data->super_oid, DEFAULT_ABBREV));
1624 fetch_task_release(task);
1625 free(task);
1626 continue;
1629 if (!spf->quiet)
1630 strbuf_addf(err,
1631 _("Fetching submodule %s%s at commit %s\n"),
1632 spf->prefix, task->sub->path,
1633 find_unique_abbrev(cs_data->super_oid,
1634 DEFAULT_ABBREV));
1636 spf->changed_count++;
1638 * NEEDSWORK: Submodules set/unset a value for
1639 * core.worktree when they are populated/unpopulated by
1640 * "git checkout" (and similar commands, see
1641 * submodule_move_head() and
1642 * connect_work_tree_and_git_dir()), but if the
1643 * submodule is unpopulated in another way (e.g. "git
1644 * rm", "rm -r"), core.worktree will still be set even
1645 * though the directory doesn't exist, and the child
1646 * process will crash while trying to chdir into the
1647 * nonexistent directory.
1649 * In this case, we know that the submodule has no
1650 * working tree, so we can work around this by
1651 * setting "--work-tree=." (--bare does not work because
1652 * worktree settings take precedence over bare-ness).
1653 * However, this is not necessarily true in other cases,
1654 * so a generalized solution is still necessary.
1656 * Possible solutions:
1657 * - teach "git [add|rm]" to unset core.worktree and
1658 * discourage users from removing submodules without
1659 * using a Git command.
1660 * - teach submodule child processes to ignore stale
1661 * core.worktree values.
1663 strvec_push(&task->git_args, "--work-tree=.");
1664 return task;
1666 return NULL;
1669 static int get_next_submodule(struct child_process *cp, struct strbuf *err,
1670 void *data, void **task_cb)
1672 struct submodule_parallel_fetch *spf = data;
1673 struct fetch_task *task =
1674 get_fetch_task_from_index(spf, err);
1675 if (!task)
1676 task = get_fetch_task_from_changed(spf, err);
1678 if (task) {
1679 struct strbuf submodule_prefix = STRBUF_INIT;
1681 child_process_init(cp);
1682 cp->dir = task->repo->gitdir;
1683 prepare_submodule_repo_env_in_gitdir(&cp->env);
1684 cp->git_cmd = 1;
1685 strvec_init(&cp->args);
1686 if (task->git_args.nr)
1687 strvec_pushv(&cp->args, task->git_args.v);
1688 strvec_pushv(&cp->args, spf->args.v);
1689 strvec_push(&cp->args, task->default_argv);
1690 strvec_push(&cp->args, "--submodule-prefix");
1692 strbuf_addf(&submodule_prefix, "%s%s/",
1693 spf->prefix,
1694 task->sub->path);
1695 strvec_push(&cp->args, submodule_prefix.buf);
1696 *task_cb = task;
1698 strbuf_release(&submodule_prefix);
1699 string_list_insert(&spf->seen_submodule_names, task->sub->name);
1700 return 1;
1703 if (spf->oid_fetch_tasks_nr) {
1704 struct fetch_task *task =
1705 spf->oid_fetch_tasks[spf->oid_fetch_tasks_nr - 1];
1706 struct strbuf submodule_prefix = STRBUF_INIT;
1707 spf->oid_fetch_tasks_nr--;
1709 strbuf_addf(&submodule_prefix, "%s%s/",
1710 spf->prefix, task->sub->path);
1712 child_process_init(cp);
1713 prepare_submodule_repo_env_in_gitdir(&cp->env);
1714 cp->git_cmd = 1;
1715 cp->dir = task->repo->gitdir;
1717 strvec_init(&cp->args);
1718 strvec_pushv(&cp->args, spf->args.v);
1719 strvec_push(&cp->args, "on-demand");
1720 strvec_push(&cp->args, "--submodule-prefix");
1721 strvec_push(&cp->args, submodule_prefix.buf);
1723 /* NEEDSWORK: have get_default_remote from submodule--helper */
1724 strvec_push(&cp->args, "origin");
1725 oid_array_for_each_unique(task->commits,
1726 append_oid_to_argv, &cp->args);
1728 *task_cb = task;
1729 strbuf_release(&submodule_prefix);
1730 return 1;
1733 return 0;
1736 static int fetch_start_failure(struct strbuf *err,
1737 void *cb, void *task_cb)
1739 struct submodule_parallel_fetch *spf = cb;
1740 struct fetch_task *task = task_cb;
1742 spf->result = 1;
1744 fetch_task_release(task);
1745 return 0;
1748 static int commit_missing_in_sub(const struct object_id *oid, void *data)
1750 struct repository *subrepo = data;
1752 enum object_type type = oid_object_info(subrepo, oid, NULL);
1754 return type != OBJ_COMMIT;
1757 static int fetch_finish(int retvalue, struct strbuf *err,
1758 void *cb, void *task_cb)
1760 struct submodule_parallel_fetch *spf = cb;
1761 struct fetch_task *task = task_cb;
1763 struct string_list_item *it;
1764 struct changed_submodule_data *cs_data;
1766 if (!task || !task->sub)
1767 BUG("callback cookie bogus");
1769 if (retvalue) {
1771 * NEEDSWORK: This indicates that the overall fetch
1772 * failed, even though there may be a subsequent fetch
1773 * by commit hash that might work. It may be a good
1774 * idea to not indicate failure in this case, and only
1775 * indicate failure if the subsequent fetch fails.
1777 spf->result = 1;
1779 strbuf_addf(&spf->submodules_with_errors, "\t%s\n",
1780 task->sub->name);
1783 /* Is this the second time we process this submodule? */
1784 if (task->commits)
1785 goto out;
1787 it = string_list_lookup(&spf->changed_submodule_names, task->sub->name);
1788 if (!it)
1789 /* Could be an unchanged submodule, not contained in the list */
1790 goto out;
1792 cs_data = it->util;
1793 oid_array_filter(&cs_data->new_commits,
1794 commit_missing_in_sub,
1795 task->repo);
1797 /* Are there commits we want, but do not exist? */
1798 if (cs_data->new_commits.nr) {
1799 task->commits = &cs_data->new_commits;
1800 ALLOC_GROW(spf->oid_fetch_tasks,
1801 spf->oid_fetch_tasks_nr + 1,
1802 spf->oid_fetch_tasks_alloc);
1803 spf->oid_fetch_tasks[spf->oid_fetch_tasks_nr] = task;
1804 spf->oid_fetch_tasks_nr++;
1805 return 0;
1808 out:
1809 fetch_task_release(task);
1811 return 0;
1814 int fetch_submodules(struct repository *r,
1815 const struct strvec *options,
1816 const char *prefix, int command_line_option,
1817 int default_option,
1818 int quiet, int max_parallel_jobs)
1820 int i;
1821 struct submodule_parallel_fetch spf = SPF_INIT;
1823 spf.r = r;
1824 spf.command_line_option = command_line_option;
1825 spf.default_option = default_option;
1826 spf.quiet = quiet;
1827 spf.prefix = prefix;
1829 if (!r->worktree)
1830 goto out;
1832 if (repo_read_index(r) < 0)
1833 die(_("index file corrupt"));
1835 strvec_push(&spf.args, "fetch");
1836 for (i = 0; i < options->nr; i++)
1837 strvec_push(&spf.args, options->v[i]);
1838 strvec_push(&spf.args, "--recurse-submodules-default");
1839 /* default value, "--submodule-prefix" and its value are added later */
1841 calculate_changed_submodule_paths(r, &spf.changed_submodule_names);
1842 string_list_sort(&spf.changed_submodule_names);
1843 run_processes_parallel_tr2(max_parallel_jobs,
1844 get_next_submodule,
1845 fetch_start_failure,
1846 fetch_finish,
1847 &spf,
1848 "submodule", "parallel/fetch");
1850 if (spf.submodules_with_errors.len > 0)
1851 fprintf(stderr, _("Errors during submodule fetch:\n%s"),
1852 spf.submodules_with_errors.buf);
1855 strvec_clear(&spf.args);
1856 out:
1857 free_submodules_data(&spf.changed_submodule_names);
1858 return spf.result;
1861 unsigned is_submodule_modified(const char *path, int ignore_untracked)
1863 struct child_process cp = CHILD_PROCESS_INIT;
1864 struct strbuf buf = STRBUF_INIT;
1865 FILE *fp;
1866 unsigned dirty_submodule = 0;
1867 const char *git_dir;
1868 int ignore_cp_exit_code = 0;
1870 strbuf_addf(&buf, "%s/.git", path);
1871 git_dir = read_gitfile(buf.buf);
1872 if (!git_dir)
1873 git_dir = buf.buf;
1874 if (!is_git_directory(git_dir)) {
1875 if (is_directory(git_dir))
1876 die(_("'%s' not recognized as a git repository"), git_dir);
1877 strbuf_release(&buf);
1878 /* The submodule is not checked out, so it is not modified */
1879 return 0;
1881 strbuf_reset(&buf);
1883 strvec_pushl(&cp.args, "status", "--porcelain=2", NULL);
1884 if (ignore_untracked)
1885 strvec_push(&cp.args, "-uno");
1887 prepare_submodule_repo_env(&cp.env);
1888 cp.git_cmd = 1;
1889 cp.no_stdin = 1;
1890 cp.out = -1;
1891 cp.dir = path;
1892 if (start_command(&cp))
1893 die(_("Could not run 'git status --porcelain=2' in submodule %s"), path);
1895 fp = xfdopen(cp.out, "r");
1896 while (strbuf_getwholeline(&buf, fp, '\n') != EOF) {
1897 /* regular untracked files */
1898 if (buf.buf[0] == '?')
1899 dirty_submodule |= DIRTY_SUBMODULE_UNTRACKED;
1901 if (buf.buf[0] == 'u' ||
1902 buf.buf[0] == '1' ||
1903 buf.buf[0] == '2') {
1904 /* T = line type, XY = status, SSSS = submodule state */
1905 if (buf.len < strlen("T XY SSSS"))
1906 BUG("invalid status --porcelain=2 line %s",
1907 buf.buf);
1909 if (buf.buf[5] == 'S' && buf.buf[8] == 'U')
1910 /* nested untracked file */
1911 dirty_submodule |= DIRTY_SUBMODULE_UNTRACKED;
1913 if (buf.buf[0] == 'u' ||
1914 buf.buf[0] == '2' ||
1915 memcmp(buf.buf + 5, "S..U", 4))
1916 /* other change */
1917 dirty_submodule |= DIRTY_SUBMODULE_MODIFIED;
1920 if ((dirty_submodule & DIRTY_SUBMODULE_MODIFIED) &&
1921 ((dirty_submodule & DIRTY_SUBMODULE_UNTRACKED) ||
1922 ignore_untracked)) {
1924 * We're not interested in any further information from
1925 * the child any more, neither output nor its exit code.
1927 ignore_cp_exit_code = 1;
1928 break;
1931 fclose(fp);
1933 if (finish_command(&cp) && !ignore_cp_exit_code)
1934 die(_("'git status --porcelain=2' failed in submodule %s"), path);
1936 strbuf_release(&buf);
1937 return dirty_submodule;
1940 int submodule_uses_gitfile(const char *path)
1942 struct child_process cp = CHILD_PROCESS_INIT;
1943 struct strbuf buf = STRBUF_INIT;
1944 const char *git_dir;
1946 strbuf_addf(&buf, "%s/.git", path);
1947 git_dir = read_gitfile(buf.buf);
1948 if (!git_dir) {
1949 strbuf_release(&buf);
1950 return 0;
1952 strbuf_release(&buf);
1954 /* Now test that all nested submodules use a gitfile too */
1955 strvec_pushl(&cp.args,
1956 "submodule", "foreach", "--quiet", "--recursive",
1957 "test -f .git", NULL);
1959 prepare_submodule_repo_env(&cp.env);
1960 cp.git_cmd = 1;
1961 cp.no_stdin = 1;
1962 cp.no_stderr = 1;
1963 cp.no_stdout = 1;
1964 cp.dir = path;
1965 if (run_command(&cp))
1966 return 0;
1968 return 1;
1972 * Check if it is a bad idea to remove a submodule, i.e. if we'd lose data
1973 * when doing so.
1975 * Return 1 if we'd lose data, return 0 if the removal is fine,
1976 * and negative values for errors.
1978 int bad_to_remove_submodule(const char *path, unsigned flags)
1980 ssize_t len;
1981 struct child_process cp = CHILD_PROCESS_INIT;
1982 struct strbuf buf = STRBUF_INIT;
1983 int ret = 0;
1985 if (!file_exists(path) || is_empty_dir(path))
1986 return 0;
1988 if (!submodule_uses_gitfile(path))
1989 return 1;
1991 strvec_pushl(&cp.args, "status", "--porcelain",
1992 "--ignore-submodules=none", NULL);
1994 if (flags & SUBMODULE_REMOVAL_IGNORE_UNTRACKED)
1995 strvec_push(&cp.args, "-uno");
1996 else
1997 strvec_push(&cp.args, "-uall");
1999 if (!(flags & SUBMODULE_REMOVAL_IGNORE_IGNORED_UNTRACKED))
2000 strvec_push(&cp.args, "--ignored");
2002 prepare_submodule_repo_env(&cp.env);
2003 cp.git_cmd = 1;
2004 cp.no_stdin = 1;
2005 cp.out = -1;
2006 cp.dir = path;
2007 if (start_command(&cp)) {
2008 if (flags & SUBMODULE_REMOVAL_DIE_ON_ERROR)
2009 die(_("could not start 'git status' in submodule '%s'"),
2010 path);
2011 ret = -1;
2012 goto out;
2015 len = strbuf_read(&buf, cp.out, 1024);
2016 if (len > 2)
2017 ret = 1;
2018 close(cp.out);
2020 if (finish_command(&cp)) {
2021 if (flags & SUBMODULE_REMOVAL_DIE_ON_ERROR)
2022 die(_("could not run 'git status' in submodule '%s'"),
2023 path);
2024 ret = -1;
2026 out:
2027 strbuf_release(&buf);
2028 return ret;
2031 void submodule_unset_core_worktree(const struct submodule *sub)
2033 struct strbuf config_path = STRBUF_INIT;
2035 submodule_name_to_gitdir(&config_path, the_repository, sub->name);
2036 strbuf_addstr(&config_path, "/config");
2038 if (git_config_set_in_file_gently(config_path.buf, "core.worktree", NULL))
2039 warning(_("Could not unset core.worktree setting in submodule '%s'"),
2040 sub->path);
2042 strbuf_release(&config_path);
2045 static const char *get_super_prefix_or_empty(void)
2047 const char *s = get_super_prefix();
2048 if (!s)
2049 s = "";
2050 return s;
2053 static int submodule_has_dirty_index(const struct submodule *sub)
2055 struct child_process cp = CHILD_PROCESS_INIT;
2057 prepare_submodule_repo_env(&cp.env);
2059 cp.git_cmd = 1;
2060 strvec_pushl(&cp.args, "diff-index", "--quiet",
2061 "--cached", "HEAD", NULL);
2062 cp.no_stdin = 1;
2063 cp.no_stdout = 1;
2064 cp.dir = sub->path;
2065 if (start_command(&cp))
2066 die(_("could not recurse into submodule '%s'"), sub->path);
2068 return finish_command(&cp);
2071 static void submodule_reset_index(const char *path)
2073 struct child_process cp = CHILD_PROCESS_INIT;
2074 prepare_submodule_repo_env(&cp.env);
2076 cp.git_cmd = 1;
2077 cp.no_stdin = 1;
2078 cp.dir = path;
2080 strvec_pushf(&cp.args, "--super-prefix=%s%s/",
2081 get_super_prefix_or_empty(), path);
2082 /* TODO: determine if this might overwright untracked files */
2083 strvec_pushl(&cp.args, "read-tree", "-u", "--reset", NULL);
2085 strvec_push(&cp.args, empty_tree_oid_hex());
2087 if (run_command(&cp))
2088 die(_("could not reset submodule index"));
2092 * Moves a submodule at a given path from a given head to another new head.
2093 * For edge cases (a submodule coming into existence or removing a submodule)
2094 * pass NULL for old or new respectively.
2096 int submodule_move_head(const char *path,
2097 const char *old_head,
2098 const char *new_head,
2099 unsigned flags)
2101 int ret = 0;
2102 struct child_process cp = CHILD_PROCESS_INIT;
2103 const struct submodule *sub;
2104 int *error_code_ptr, error_code;
2106 if (!is_submodule_active(the_repository, path))
2107 return 0;
2109 if (flags & SUBMODULE_MOVE_HEAD_FORCE)
2111 * Pass non NULL pointer to is_submodule_populated_gently
2112 * to prevent die()-ing. We'll use connect_work_tree_and_git_dir
2113 * to fixup the submodule in the force case later.
2115 error_code_ptr = &error_code;
2116 else
2117 error_code_ptr = NULL;
2119 if (old_head && !is_submodule_populated_gently(path, error_code_ptr))
2120 return 0;
2122 sub = submodule_from_path(the_repository, null_oid(), path);
2124 if (!sub)
2125 BUG("could not get submodule information for '%s'", path);
2127 if (old_head && !(flags & SUBMODULE_MOVE_HEAD_FORCE)) {
2128 /* Check if the submodule has a dirty index. */
2129 if (submodule_has_dirty_index(sub))
2130 return error(_("submodule '%s' has dirty index"), path);
2133 if (!(flags & SUBMODULE_MOVE_HEAD_DRY_RUN)) {
2134 if (old_head) {
2135 if (!submodule_uses_gitfile(path))
2136 absorb_git_dir_into_superproject(path,
2137 ABSORB_GITDIR_RECURSE_SUBMODULES);
2138 } else {
2139 struct strbuf gitdir = STRBUF_INIT;
2140 submodule_name_to_gitdir(&gitdir, the_repository,
2141 sub->name);
2142 connect_work_tree_and_git_dir(path, gitdir.buf, 0);
2143 strbuf_release(&gitdir);
2145 /* make sure the index is clean as well */
2146 submodule_reset_index(path);
2149 if (old_head && (flags & SUBMODULE_MOVE_HEAD_FORCE)) {
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, 1);
2154 strbuf_release(&gitdir);
2158 prepare_submodule_repo_env(&cp.env);
2160 cp.git_cmd = 1;
2161 cp.no_stdin = 1;
2162 cp.dir = path;
2164 strvec_pushf(&cp.args, "--super-prefix=%s%s/",
2165 get_super_prefix_or_empty(), path);
2166 strvec_pushl(&cp.args, "read-tree", "--recurse-submodules", NULL);
2168 if (flags & SUBMODULE_MOVE_HEAD_DRY_RUN)
2169 strvec_push(&cp.args, "-n");
2170 else
2171 strvec_push(&cp.args, "-u");
2173 if (flags & SUBMODULE_MOVE_HEAD_FORCE)
2174 strvec_push(&cp.args, "--reset");
2175 else
2176 strvec_push(&cp.args, "-m");
2178 if (!(flags & SUBMODULE_MOVE_HEAD_FORCE))
2179 strvec_push(&cp.args, old_head ? old_head : empty_tree_oid_hex());
2181 strvec_push(&cp.args, new_head ? new_head : empty_tree_oid_hex());
2183 if (run_command(&cp)) {
2184 ret = error(_("Submodule '%s' could not be updated."), path);
2185 goto out;
2188 if (!(flags & SUBMODULE_MOVE_HEAD_DRY_RUN)) {
2189 if (new_head) {
2190 child_process_init(&cp);
2191 /* also set the HEAD accordingly */
2192 cp.git_cmd = 1;
2193 cp.no_stdin = 1;
2194 cp.dir = path;
2196 prepare_submodule_repo_env(&cp.env);
2197 strvec_pushl(&cp.args, "update-ref", "HEAD",
2198 "--no-deref", new_head, NULL);
2200 if (run_command(&cp)) {
2201 ret = -1;
2202 goto out;
2204 } else {
2205 struct strbuf sb = STRBUF_INIT;
2207 strbuf_addf(&sb, "%s/.git", path);
2208 unlink_or_warn(sb.buf);
2209 strbuf_release(&sb);
2211 if (is_empty_dir(path))
2212 rmdir_or_warn(path);
2214 submodule_unset_core_worktree(sub);
2217 out:
2218 return ret;
2221 int validate_submodule_git_dir(char *git_dir, const char *submodule_name)
2223 size_t len = strlen(git_dir), suffix_len = strlen(submodule_name);
2224 char *p;
2225 int ret = 0;
2227 if (len <= suffix_len || (p = git_dir + len - suffix_len)[-1] != '/' ||
2228 strcmp(p, submodule_name))
2229 BUG("submodule name '%s' not a suffix of git dir '%s'",
2230 submodule_name, git_dir);
2233 * We prevent the contents of sibling submodules' git directories to
2234 * clash.
2236 * Example: having a submodule named `hippo` and another one named
2237 * `hippo/hooks` would result in the git directories
2238 * `.git/modules/hippo/` and `.git/modules/hippo/hooks/`, respectively,
2239 * but the latter directory is already designated to contain the hooks
2240 * of the former.
2242 for (; *p; p++) {
2243 if (is_dir_sep(*p)) {
2244 char c = *p;
2246 *p = '\0';
2247 if (is_git_directory(git_dir))
2248 ret = -1;
2249 *p = c;
2251 if (ret < 0)
2252 return error(_("submodule git dir '%s' is "
2253 "inside git dir '%.*s'"),
2254 git_dir,
2255 (int)(p - git_dir), git_dir);
2259 return 0;
2263 * Embeds a single submodules git directory into the superprojects git dir,
2264 * non recursively.
2266 static void relocate_single_git_dir_into_superproject(const char *path)
2268 char *old_git_dir = NULL, *real_old_git_dir = NULL, *real_new_git_dir = NULL;
2269 struct strbuf new_gitdir = STRBUF_INIT;
2270 const struct submodule *sub;
2272 if (submodule_uses_worktrees(path))
2273 die(_("relocate_gitdir for submodule '%s' with "
2274 "more than one worktree not supported"), path);
2276 old_git_dir = xstrfmt("%s/.git", path);
2277 if (read_gitfile(old_git_dir))
2278 /* If it is an actual gitfile, it doesn't need migration. */
2279 return;
2281 real_old_git_dir = real_pathdup(old_git_dir, 1);
2283 sub = submodule_from_path(the_repository, null_oid(), path);
2284 if (!sub)
2285 die(_("could not lookup name for submodule '%s'"), path);
2287 submodule_name_to_gitdir(&new_gitdir, the_repository, sub->name);
2288 if (validate_submodule_git_dir(new_gitdir.buf, sub->name) < 0)
2289 die(_("refusing to move '%s' into an existing git dir"),
2290 real_old_git_dir);
2291 if (safe_create_leading_directories_const(new_gitdir.buf) < 0)
2292 die(_("could not create directory '%s'"), new_gitdir.buf);
2293 real_new_git_dir = real_pathdup(new_gitdir.buf, 1);
2295 fprintf(stderr, _("Migrating git directory of '%s%s' from\n'%s' to\n'%s'\n"),
2296 get_super_prefix_or_empty(), path,
2297 real_old_git_dir, real_new_git_dir);
2299 relocate_gitdir(path, real_old_git_dir, real_new_git_dir);
2301 free(old_git_dir);
2302 free(real_old_git_dir);
2303 free(real_new_git_dir);
2304 strbuf_release(&new_gitdir);
2308 * Migrate the git directory of the submodule given by path from
2309 * having its git directory within the working tree to the git dir nested
2310 * in its superprojects git dir under modules/.
2312 void absorb_git_dir_into_superproject(const char *path,
2313 unsigned flags)
2315 int err_code;
2316 const char *sub_git_dir;
2317 struct strbuf gitdir = STRBUF_INIT;
2318 strbuf_addf(&gitdir, "%s/.git", path);
2319 sub_git_dir = resolve_gitdir_gently(gitdir.buf, &err_code);
2321 /* Not populated? */
2322 if (!sub_git_dir) {
2323 const struct submodule *sub;
2324 struct strbuf sub_gitdir = STRBUF_INIT;
2326 if (err_code == READ_GITFILE_ERR_STAT_FAILED) {
2327 /* unpopulated as expected */
2328 strbuf_release(&gitdir);
2329 return;
2332 if (err_code != READ_GITFILE_ERR_NOT_A_REPO)
2333 /* We don't know what broke here. */
2334 read_gitfile_error_die(err_code, path, NULL);
2337 * Maybe populated, but no git directory was found?
2338 * This can happen if the superproject is a submodule
2339 * itself and was just absorbed. The absorption of the
2340 * superproject did not rewrite the git file links yet,
2341 * fix it now.
2343 sub = submodule_from_path(the_repository, null_oid(), path);
2344 if (!sub)
2345 die(_("could not lookup name for submodule '%s'"), path);
2346 submodule_name_to_gitdir(&sub_gitdir, the_repository, sub->name);
2347 connect_work_tree_and_git_dir(path, sub_gitdir.buf, 0);
2348 strbuf_release(&sub_gitdir);
2349 } else {
2350 /* Is it already absorbed into the superprojects git dir? */
2351 char *real_sub_git_dir = real_pathdup(sub_git_dir, 1);
2352 char *real_common_git_dir = real_pathdup(get_git_common_dir(), 1);
2354 if (!starts_with(real_sub_git_dir, real_common_git_dir))
2355 relocate_single_git_dir_into_superproject(path);
2357 free(real_sub_git_dir);
2358 free(real_common_git_dir);
2360 strbuf_release(&gitdir);
2362 if (flags & ABSORB_GITDIR_RECURSE_SUBMODULES) {
2363 struct child_process cp = CHILD_PROCESS_INIT;
2364 struct strbuf sb = STRBUF_INIT;
2366 if (flags & ~ABSORB_GITDIR_RECURSE_SUBMODULES)
2367 BUG("we don't know how to pass the flags down?");
2369 strbuf_addstr(&sb, get_super_prefix_or_empty());
2370 strbuf_addstr(&sb, path);
2371 strbuf_addch(&sb, '/');
2373 cp.dir = path;
2374 cp.git_cmd = 1;
2375 cp.no_stdin = 1;
2376 strvec_pushl(&cp.args, "--super-prefix", sb.buf,
2377 "submodule--helper",
2378 "absorbgitdirs", NULL);
2379 prepare_submodule_repo_env(&cp.env);
2380 if (run_command(&cp))
2381 die(_("could not recurse into submodule '%s'"), path);
2383 strbuf_release(&sb);
2387 int get_superproject_working_tree(struct strbuf *buf)
2389 struct child_process cp = CHILD_PROCESS_INIT;
2390 struct strbuf sb = STRBUF_INIT;
2391 struct strbuf one_up = STRBUF_INIT;
2392 char *cwd = xgetcwd();
2393 int ret = 0;
2394 const char *subpath;
2395 int code;
2396 ssize_t len;
2398 if (!is_inside_work_tree())
2400 * FIXME:
2401 * We might have a superproject, but it is harder
2402 * to determine.
2404 return 0;
2406 if (!strbuf_realpath(&one_up, "../", 0))
2407 return 0;
2409 subpath = relative_path(cwd, one_up.buf, &sb);
2410 strbuf_release(&one_up);
2412 prepare_submodule_repo_env(&cp.env);
2413 strvec_pop(&cp.env);
2415 strvec_pushl(&cp.args, "--literal-pathspecs", "-C", "..",
2416 "ls-files", "-z", "--stage", "--full-name", "--",
2417 subpath, NULL);
2418 strbuf_reset(&sb);
2420 cp.no_stdin = 1;
2421 cp.no_stderr = 1;
2422 cp.out = -1;
2423 cp.git_cmd = 1;
2425 if (start_command(&cp))
2426 die(_("could not start ls-files in .."));
2428 len = strbuf_read(&sb, cp.out, PATH_MAX);
2429 close(cp.out);
2431 if (starts_with(sb.buf, "160000")) {
2432 int super_sub_len;
2433 int cwd_len = strlen(cwd);
2434 char *super_sub, *super_wt;
2437 * There is a superproject having this repo as a submodule.
2438 * The format is <mode> SP <hash> SP <stage> TAB <full name> \0,
2439 * We're only interested in the name after the tab.
2441 super_sub = strchr(sb.buf, '\t') + 1;
2442 super_sub_len = strlen(super_sub);
2444 if (super_sub_len > cwd_len ||
2445 strcmp(&cwd[cwd_len - super_sub_len], super_sub))
2446 BUG("returned path string doesn't match cwd?");
2448 super_wt = xstrdup(cwd);
2449 super_wt[cwd_len - super_sub_len] = '\0';
2451 strbuf_realpath(buf, super_wt, 1);
2452 ret = 1;
2453 free(super_wt);
2455 free(cwd);
2456 strbuf_release(&sb);
2458 code = finish_command(&cp);
2460 if (code == 128)
2461 /* '../' is not a git repository */
2462 return 0;
2463 if (code == 0 && len == 0)
2464 /* There is an unrelated git repository at '../' */
2465 return 0;
2466 if (code)
2467 die(_("ls-tree returned unexpected return code %d"), code);
2469 return ret;
2473 * Put the gitdir for a submodule (given relative to the main
2474 * repository worktree) into `buf`, or return -1 on error.
2476 int submodule_to_gitdir(struct strbuf *buf, const char *submodule)
2478 const struct submodule *sub;
2479 const char *git_dir;
2480 int ret = 0;
2482 strbuf_reset(buf);
2483 strbuf_addstr(buf, submodule);
2484 strbuf_complete(buf, '/');
2485 strbuf_addstr(buf, ".git");
2487 git_dir = read_gitfile(buf->buf);
2488 if (git_dir) {
2489 strbuf_reset(buf);
2490 strbuf_addstr(buf, git_dir);
2492 if (!is_git_directory(buf->buf)) {
2493 sub = submodule_from_path(the_repository, null_oid(),
2494 submodule);
2495 if (!sub) {
2496 ret = -1;
2497 goto cleanup;
2499 strbuf_reset(buf);
2500 submodule_name_to_gitdir(buf, the_repository, sub->name);
2503 cleanup:
2504 return ret;
2507 void submodule_name_to_gitdir(struct strbuf *buf, struct repository *r,
2508 const char *submodule_name)
2511 * NEEDSWORK: The current way of mapping a submodule's name to
2512 * its location in .git/modules/ has problems with some naming
2513 * schemes. For example, if a submodule is named "foo" and
2514 * another is named "foo/bar" (whether present in the same
2515 * superproject commit or not - the problem will arise if both
2516 * superproject commits have been checked out at any point in
2517 * time), or if two submodule names only have different cases in
2518 * a case-insensitive filesystem.
2520 * There are several solutions, including encoding the path in
2521 * some way, introducing a submodule.<name>.gitdir config in
2522 * .git/config (not .gitmodules) that allows overriding what the
2523 * gitdir of a submodule would be (and teach Git, upon noticing
2524 * a clash, to automatically determine a non-clashing name and
2525 * to write such a config), or introducing a
2526 * submodule.<name>.gitdir config in .gitmodules that repo
2527 * administrators can explicitly set. Nothing has been decided,
2528 * so for now, just append the name at the end of the path.
2530 strbuf_repo_git_path(buf, r, "modules/");
2531 strbuf_addstr(buf, submodule_name);