Merge branch 'pb/complete-diff-options'
[git/debian.git] / submodule.c
blobf0f8788d2e34a0ee7fe1aa853cf8a7f1890abd6b
1 #include "git-compat-util.h"
2 #include "abspath.h"
3 #include "alloc.h"
4 #include "repository.h"
5 #include "config.h"
6 #include "submodule-config.h"
7 #include "submodule.h"
8 #include "dir.h"
9 #include "diff.h"
10 #include "commit.h"
11 #include "environment.h"
12 #include "gettext.h"
13 #include "hex.h"
14 #include "revision.h"
15 #include "run-command.h"
16 #include "diffcore.h"
17 #include "refs.h"
18 #include "string-list.h"
19 #include "oid-array.h"
20 #include "strvec.h"
21 #include "blob.h"
22 #include "thread-utils.h"
23 #include "path.h"
24 #include "quote.h"
25 #include "remote.h"
26 #include "worktree.h"
27 #include "parse-options.h"
28 #include "object-file.h"
29 #include "object-name.h"
30 #include "object-store-ll.h"
31 #include "commit-reach.h"
32 #include "read-cache-ll.h"
33 #include "setup.h"
34 #include "shallow.h"
35 #include "trace2.h"
37 static int config_update_recurse_submodules = RECURSE_SUBMODULES_OFF;
38 static int initialized_fetch_ref_tips;
39 static struct oid_array ref_tips_before_fetch;
40 static struct oid_array ref_tips_after_fetch;
43 * Check if the .gitmodules file is unmerged. Parsing of the .gitmodules file
44 * will be disabled because we can't guess what might be configured in
45 * .gitmodules unless the user resolves the conflict.
47 int is_gitmodules_unmerged(struct index_state *istate)
49 int pos = index_name_pos(istate, GITMODULES_FILE, strlen(GITMODULES_FILE));
50 if (pos < 0) { /* .gitmodules not found or isn't merged */
51 pos = -1 - pos;
52 if (istate->cache_nr > pos) { /* there is a .gitmodules */
53 const struct cache_entry *ce = istate->cache[pos];
54 if (ce_namelen(ce) == strlen(GITMODULES_FILE) &&
55 !strcmp(ce->name, GITMODULES_FILE))
56 return 1;
60 return 0;
64 * Check if the .gitmodules file is safe to write.
66 * Writing to the .gitmodules file requires that the file exists in the
67 * working tree or, if it doesn't, that a brand new .gitmodules file is going
68 * to be created (i.e. it's neither in the index nor in the current branch).
70 * It is not safe to write to .gitmodules if it's not in the working tree but
71 * it is in the index or in the current branch, because writing new values
72 * (and staging them) would blindly overwrite ALL the old content.
74 int is_writing_gitmodules_ok(void)
76 struct object_id oid;
77 return file_exists(GITMODULES_FILE) ||
78 (repo_get_oid(the_repository, GITMODULES_INDEX, &oid) < 0 && repo_get_oid(the_repository, GITMODULES_HEAD, &oid) < 0);
82 * Check if the .gitmodules file has unstaged modifications. This must be
83 * checked before allowing modifications to the .gitmodules file with the
84 * intention to stage them later, because when continuing we would stage the
85 * modifications the user didn't stage herself too. That might change in a
86 * future version when we learn to stage the changes we do ourselves without
87 * staging any previous modifications.
89 int is_staging_gitmodules_ok(struct index_state *istate)
91 int pos = index_name_pos(istate, GITMODULES_FILE, strlen(GITMODULES_FILE));
93 if ((pos >= 0) && (pos < istate->cache_nr)) {
94 struct stat st;
95 if (lstat(GITMODULES_FILE, &st) == 0 &&
96 ie_modified(istate, istate->cache[pos], &st, 0) & DATA_CHANGED)
97 return 0;
100 return 1;
103 static int for_each_remote_ref_submodule(const char *submodule,
104 each_ref_fn fn, void *cb_data)
106 return refs_for_each_remote_ref(get_submodule_ref_store(submodule),
107 fn, cb_data);
111 * Try to update the "path" entry in the "submodule.<name>" section of the
112 * .gitmodules file. Return 0 only if a .gitmodules file was found, a section
113 * with the correct path=<oldpath> setting was found and we could update it.
115 int update_path_in_gitmodules(const char *oldpath, const char *newpath)
117 struct strbuf entry = STRBUF_INIT;
118 const struct submodule *submodule;
119 int ret;
121 if (!file_exists(GITMODULES_FILE)) /* Do nothing without .gitmodules */
122 return -1;
124 if (is_gitmodules_unmerged(the_repository->index))
125 die(_("Cannot change unmerged .gitmodules, resolve merge conflicts first"));
127 submodule = submodule_from_path(the_repository, null_oid(), oldpath);
128 if (!submodule || !submodule->name) {
129 warning(_("Could not find section in .gitmodules where path=%s"), oldpath);
130 return -1;
132 strbuf_addstr(&entry, "submodule.");
133 strbuf_addstr(&entry, submodule->name);
134 strbuf_addstr(&entry, ".path");
135 ret = config_set_in_gitmodules_file_gently(entry.buf, newpath);
136 strbuf_release(&entry);
137 return ret;
141 * Try to remove the "submodule.<name>" section from .gitmodules where the given
142 * path is configured. Return 0 only if a .gitmodules file was found, a section
143 * with the correct path=<path> setting was found and we could remove it.
145 int remove_path_from_gitmodules(const char *path)
147 struct strbuf sect = STRBUF_INIT;
148 const struct submodule *submodule;
150 if (!file_exists(GITMODULES_FILE)) /* Do nothing without .gitmodules */
151 return -1;
153 if (is_gitmodules_unmerged(the_repository->index))
154 die(_("Cannot change unmerged .gitmodules, resolve merge conflicts first"));
156 submodule = submodule_from_path(the_repository, null_oid(), path);
157 if (!submodule || !submodule->name) {
158 warning(_("Could not find section in .gitmodules where path=%s"), path);
159 return -1;
161 strbuf_addstr(&sect, "submodule.");
162 strbuf_addstr(&sect, submodule->name);
163 if (git_config_rename_section_in_file(GITMODULES_FILE, sect.buf, NULL) < 0) {
164 /* Maybe the user already did that, don't error out here */
165 warning(_("Could not remove .gitmodules entry for %s"), path);
166 strbuf_release(&sect);
167 return -1;
169 strbuf_release(&sect);
170 return 0;
173 void stage_updated_gitmodules(struct index_state *istate)
175 if (add_file_to_index(istate, GITMODULES_FILE, 0))
176 die(_("staging updated .gitmodules failed"));
179 static struct string_list added_submodule_odb_paths = STRING_LIST_INIT_NODUP;
181 void add_submodule_odb_by_path(const char *path)
183 string_list_insert(&added_submodule_odb_paths, xstrdup(path));
186 int register_all_submodule_odb_as_alternates(void)
188 int i;
189 int ret = added_submodule_odb_paths.nr;
191 for (i = 0; i < added_submodule_odb_paths.nr; i++)
192 add_to_alternates_memory(added_submodule_odb_paths.items[i].string);
193 if (ret) {
194 string_list_clear(&added_submodule_odb_paths, 0);
195 trace2_data_intmax("submodule", the_repository,
196 "register_all_submodule_odb_as_alternates/registered", ret);
197 if (git_env_bool("GIT_TEST_FATAL_REGISTER_SUBMODULE_ODB", 0))
198 BUG("register_all_submodule_odb_as_alternates() called");
200 return ret;
203 void set_diffopt_flags_from_submodule_config(struct diff_options *diffopt,
204 const char *path)
206 const struct submodule *submodule = submodule_from_path(the_repository,
207 null_oid(),
208 path);
209 if (submodule) {
210 const char *ignore;
211 char *key;
213 key = xstrfmt("submodule.%s.ignore", submodule->name);
214 if (repo_config_get_string_tmp(the_repository, key, &ignore))
215 ignore = submodule->ignore;
216 free(key);
218 if (ignore)
219 handle_ignore_submodules_arg(diffopt, ignore);
220 else if (is_gitmodules_unmerged(the_repository->index))
221 diffopt->flags.ignore_submodules = 1;
225 /* Cheap function that only determines if we're interested in submodules at all */
226 int git_default_submodule_config(const char *var, const char *value,
227 void *cb UNUSED)
229 if (!strcmp(var, "submodule.recurse")) {
230 int v = git_config_bool(var, value) ?
231 RECURSE_SUBMODULES_ON : RECURSE_SUBMODULES_OFF;
232 config_update_recurse_submodules = v;
234 return 0;
237 int option_parse_recurse_submodules_worktree_updater(const struct option *opt,
238 const char *arg, int unset)
240 if (unset) {
241 config_update_recurse_submodules = RECURSE_SUBMODULES_OFF;
242 return 0;
244 if (arg)
245 config_update_recurse_submodules =
246 parse_update_recurse_submodules_arg(opt->long_name,
247 arg);
248 else
249 config_update_recurse_submodules = RECURSE_SUBMODULES_ON;
251 return 0;
255 * Determine if a submodule has been initialized at a given 'path'
258 * NEEDSWORK: Emit a warning if submodule.active exists, but is valueless,
259 * ie, the config looks like: "[submodule] active\n".
260 * Since that is an invalid pathspec, we should inform the user.
262 int is_tree_submodule_active(struct repository *repo,
263 const struct object_id *treeish_name,
264 const char *path)
266 int ret = 0;
267 char *key = NULL;
268 char *value = NULL;
269 const struct string_list *sl;
270 const struct submodule *module;
272 module = submodule_from_path(repo, treeish_name, path);
274 /* early return if there isn't a path->module mapping */
275 if (!module)
276 return 0;
278 /* submodule.<name>.active is set */
279 key = xstrfmt("submodule.%s.active", module->name);
280 if (!repo_config_get_bool(repo, key, &ret)) {
281 free(key);
282 return ret;
284 free(key);
286 /* submodule.active is set */
287 if (!repo_config_get_string_multi(repo, "submodule.active", &sl)) {
288 struct pathspec ps;
289 struct strvec args = STRVEC_INIT;
290 const struct string_list_item *item;
292 for_each_string_list_item(item, sl) {
293 strvec_push(&args, item->string);
296 parse_pathspec(&ps, 0, 0, NULL, args.v);
297 ret = match_pathspec(repo->index, &ps, path, strlen(path), 0, NULL, 1);
299 strvec_clear(&args);
300 clear_pathspec(&ps);
301 return ret;
304 /* fallback to checking if the URL is set */
305 key = xstrfmt("submodule.%s.url", module->name);
306 ret = !repo_config_get_string(repo, key, &value);
308 free(value);
309 free(key);
310 return ret;
313 int is_submodule_active(struct repository *repo, const char *path)
315 return is_tree_submodule_active(repo, null_oid(), path);
318 int is_submodule_populated_gently(const char *path, int *return_error_code)
320 int ret = 0;
321 char *gitdir = xstrfmt("%s/.git", path);
323 if (resolve_gitdir_gently(gitdir, return_error_code))
324 ret = 1;
326 free(gitdir);
327 return ret;
331 * Dies if the provided 'prefix' corresponds to an unpopulated submodule
333 void die_in_unpopulated_submodule(struct index_state *istate,
334 const char *prefix)
336 int i, prefixlen;
338 if (!prefix)
339 return;
341 prefixlen = strlen(prefix);
343 for (i = 0; i < istate->cache_nr; i++) {
344 struct cache_entry *ce = istate->cache[i];
345 int ce_len = ce_namelen(ce);
347 if (!S_ISGITLINK(ce->ce_mode))
348 continue;
349 if (prefixlen <= ce_len)
350 continue;
351 if (strncmp(ce->name, prefix, ce_len))
352 continue;
353 if (prefix[ce_len] != '/')
354 continue;
356 die(_("in unpopulated submodule '%s'"), ce->name);
361 * Dies if any paths in the provided pathspec descends into a submodule
363 void die_path_inside_submodule(struct index_state *istate,
364 const struct pathspec *ps)
366 int i, j;
368 for (i = 0; i < istate->cache_nr; i++) {
369 struct cache_entry *ce = istate->cache[i];
370 int ce_len = ce_namelen(ce);
372 if (!S_ISGITLINK(ce->ce_mode))
373 continue;
375 for (j = 0; j < ps->nr ; j++) {
376 const struct pathspec_item *item = &ps->items[j];
378 if (item->len <= ce_len)
379 continue;
380 if (item->match[ce_len] != '/')
381 continue;
382 if (strncmp(ce->name, item->match, ce_len))
383 continue;
384 if (item->len == ce_len + 1)
385 continue;
387 die(_("Pathspec '%s' is in submodule '%.*s'"),
388 item->original, ce_len, ce->name);
393 enum submodule_update_type parse_submodule_update_type(const char *value)
395 if (!strcmp(value, "none"))
396 return SM_UPDATE_NONE;
397 else if (!strcmp(value, "checkout"))
398 return SM_UPDATE_CHECKOUT;
399 else if (!strcmp(value, "rebase"))
400 return SM_UPDATE_REBASE;
401 else if (!strcmp(value, "merge"))
402 return SM_UPDATE_MERGE;
403 else if (*value == '!')
404 return SM_UPDATE_COMMAND;
405 else
406 return SM_UPDATE_UNSPECIFIED;
409 int parse_submodule_update_strategy(const char *value,
410 struct submodule_update_strategy *dst)
412 enum submodule_update_type type;
414 free((void*)dst->command);
415 dst->command = NULL;
417 type = parse_submodule_update_type(value);
418 if (type == SM_UPDATE_UNSPECIFIED)
419 return -1;
421 dst->type = type;
422 if (type == SM_UPDATE_COMMAND)
423 dst->command = xstrdup(value + 1);
425 return 0;
428 const char *submodule_update_type_to_string(enum submodule_update_type type)
430 switch (type) {
431 case SM_UPDATE_CHECKOUT:
432 return "checkout";
433 case SM_UPDATE_MERGE:
434 return "merge";
435 case SM_UPDATE_REBASE:
436 return "rebase";
437 case SM_UPDATE_NONE:
438 return "none";
439 case SM_UPDATE_UNSPECIFIED:
440 case SM_UPDATE_COMMAND:
441 BUG("init_submodule() should handle type %d", type);
442 default:
443 BUG("unexpected update strategy type: %d", type);
447 void handle_ignore_submodules_arg(struct diff_options *diffopt,
448 const char *arg)
450 diffopt->flags.ignore_submodule_set = 1;
451 diffopt->flags.ignore_submodules = 0;
452 diffopt->flags.ignore_untracked_in_submodules = 0;
453 diffopt->flags.ignore_dirty_submodules = 0;
455 if (!strcmp(arg, "all"))
456 diffopt->flags.ignore_submodules = 1;
457 else if (!strcmp(arg, "untracked"))
458 diffopt->flags.ignore_untracked_in_submodules = 1;
459 else if (!strcmp(arg, "dirty"))
460 diffopt->flags.ignore_dirty_submodules = 1;
461 else if (strcmp(arg, "none"))
462 die(_("bad --ignore-submodules argument: %s"), arg);
464 * Please update _git_status() in git-completion.bash when you
465 * add new options
469 static int prepare_submodule_diff_summary(struct repository *r, struct rev_info *rev,
470 const char *path,
471 struct commit *left, struct commit *right,
472 struct commit_list *merge_bases)
474 struct commit_list *list;
476 repo_init_revisions(r, rev, NULL);
477 setup_revisions(0, NULL, rev, NULL);
478 rev->left_right = 1;
479 rev->first_parent_only = 1;
480 left->object.flags |= SYMMETRIC_LEFT;
481 add_pending_object(rev, &left->object, path);
482 add_pending_object(rev, &right->object, path);
483 for (list = merge_bases; list; list = list->next) {
484 list->item->object.flags |= UNINTERESTING;
485 add_pending_object(rev, &list->item->object,
486 oid_to_hex(&list->item->object.oid));
488 return prepare_revision_walk(rev);
491 static void print_submodule_diff_summary(struct repository *r, struct rev_info *rev, struct diff_options *o)
493 static const char format[] = " %m %s";
494 struct strbuf sb = STRBUF_INIT;
495 struct commit *commit;
497 while ((commit = get_revision(rev))) {
498 struct pretty_print_context ctx = {0};
499 ctx.date_mode = rev->date_mode;
500 ctx.output_encoding = get_log_output_encoding();
501 strbuf_setlen(&sb, 0);
502 repo_format_commit_message(r, commit, format, &sb,
503 &ctx);
504 strbuf_addch(&sb, '\n');
505 if (commit->object.flags & SYMMETRIC_LEFT)
506 diff_emit_submodule_del(o, sb.buf);
507 else
508 diff_emit_submodule_add(o, sb.buf);
510 strbuf_release(&sb);
513 void prepare_submodule_repo_env(struct strvec *out)
515 prepare_other_repo_env(out, DEFAULT_GIT_DIR_ENVIRONMENT);
518 static void prepare_submodule_repo_env_in_gitdir(struct strvec *out)
520 prepare_other_repo_env(out, ".");
524 * Initialize a repository struct for a submodule based on the provided 'path'.
526 * Returns the repository struct on success,
527 * NULL when the submodule is not present.
529 static struct repository *open_submodule(const char *path)
531 struct strbuf sb = STRBUF_INIT;
532 struct repository *out = xmalloc(sizeof(*out));
534 if (submodule_to_gitdir(&sb, path) || repo_init(out, sb.buf, NULL)) {
535 strbuf_release(&sb);
536 free(out);
537 return NULL;
540 /* Mark it as a submodule */
541 out->submodule_prefix = xstrdup(path);
543 strbuf_release(&sb);
544 return out;
548 * Helper function to display the submodule header line prior to the full
549 * summary output.
551 * If it can locate the submodule git directory it will create a repository
552 * handle for the submodule and lookup both the left and right commits and
553 * put them into the left and right pointers.
555 static void show_submodule_header(struct diff_options *o,
556 const char *path,
557 struct object_id *one, struct object_id *two,
558 unsigned dirty_submodule,
559 struct repository *sub,
560 struct commit **left, struct commit **right,
561 struct commit_list **merge_bases)
563 const char *message = NULL;
564 struct strbuf sb = STRBUF_INIT;
565 int fast_forward = 0, fast_backward = 0;
567 if (dirty_submodule & DIRTY_SUBMODULE_UNTRACKED)
568 diff_emit_submodule_untracked(o, path);
570 if (dirty_submodule & DIRTY_SUBMODULE_MODIFIED)
571 diff_emit_submodule_modified(o, path);
573 if (is_null_oid(one))
574 message = "(new submodule)";
575 else if (is_null_oid(two))
576 message = "(submodule deleted)";
578 if (!sub) {
579 if (!message)
580 message = "(commits not present)";
581 goto output_header;
585 * Attempt to lookup the commit references, and determine if this is
586 * a fast forward or fast backwards update.
588 *left = lookup_commit_reference(sub, one);
589 *right = lookup_commit_reference(sub, two);
592 * Warn about missing commits in the submodule project, but only if
593 * they aren't null.
595 if ((!is_null_oid(one) && !*left) ||
596 (!is_null_oid(two) && !*right))
597 message = "(commits not present)";
599 *merge_bases = repo_get_merge_bases(sub, *left, *right);
600 if (*merge_bases) {
601 if ((*merge_bases)->item == *left)
602 fast_forward = 1;
603 else if ((*merge_bases)->item == *right)
604 fast_backward = 1;
607 if (oideq(one, two)) {
608 strbuf_release(&sb);
609 return;
612 output_header:
613 strbuf_addf(&sb, "Submodule %s ", path);
614 strbuf_add_unique_abbrev(&sb, one, DEFAULT_ABBREV);
615 strbuf_addstr(&sb, (fast_backward || fast_forward) ? ".." : "...");
616 strbuf_add_unique_abbrev(&sb, two, DEFAULT_ABBREV);
617 if (message)
618 strbuf_addf(&sb, " %s\n", message);
619 else
620 strbuf_addf(&sb, "%s:\n", fast_backward ? " (rewind)" : "");
621 diff_emit_submodule_header(o, sb.buf);
623 strbuf_release(&sb);
626 void show_submodule_diff_summary(struct diff_options *o, const char *path,
627 struct object_id *one, struct object_id *two,
628 unsigned dirty_submodule)
630 struct rev_info rev = REV_INFO_INIT;
631 struct commit *left = NULL, *right = NULL;
632 struct commit_list *merge_bases = NULL;
633 struct repository *sub;
635 sub = open_submodule(path);
636 show_submodule_header(o, path, one, two, dirty_submodule,
637 sub, &left, &right, &merge_bases);
640 * If we don't have both a left and a right pointer, there is no
641 * reason to try and display a summary. The header line should contain
642 * all the information the user needs.
644 if (!left || !right || !sub)
645 goto out;
647 /* Treat revision walker failure the same as missing commits */
648 if (prepare_submodule_diff_summary(sub, &rev, path, left, right, merge_bases)) {
649 diff_emit_submodule_error(o, "(revision walker failed)\n");
650 goto out;
653 print_submodule_diff_summary(sub, &rev, o);
655 out:
656 free_commit_list(merge_bases);
657 release_revisions(&rev);
658 clear_commit_marks(left, ~0);
659 clear_commit_marks(right, ~0);
660 if (sub) {
661 repo_clear(sub);
662 free(sub);
666 void show_submodule_inline_diff(struct diff_options *o, const char *path,
667 struct object_id *one, struct object_id *two,
668 unsigned dirty_submodule)
670 const struct object_id *old_oid = the_hash_algo->empty_tree, *new_oid = the_hash_algo->empty_tree;
671 struct commit *left = NULL, *right = NULL;
672 struct commit_list *merge_bases = NULL;
673 struct child_process cp = CHILD_PROCESS_INIT;
674 struct strbuf sb = STRBUF_INIT;
675 struct repository *sub;
677 sub = open_submodule(path);
678 show_submodule_header(o, path, one, two, dirty_submodule,
679 sub, &left, &right, &merge_bases);
681 /* We need a valid left and right commit to display a difference */
682 if (!(left || is_null_oid(one)) ||
683 !(right || is_null_oid(two)))
684 goto done;
686 if (left)
687 old_oid = one;
688 if (right)
689 new_oid = two;
691 cp.git_cmd = 1;
692 cp.dir = path;
693 cp.out = -1;
694 cp.no_stdin = 1;
696 /* TODO: other options may need to be passed here. */
697 strvec_pushl(&cp.args, "diff", "--submodule=diff", NULL);
698 strvec_pushf(&cp.args, "--color=%s", want_color(o->use_color) ?
699 "always" : "never");
701 if (o->flags.reverse_diff) {
702 strvec_pushf(&cp.args, "--src-prefix=%s%s/",
703 o->b_prefix, path);
704 strvec_pushf(&cp.args, "--dst-prefix=%s%s/",
705 o->a_prefix, path);
706 } else {
707 strvec_pushf(&cp.args, "--src-prefix=%s%s/",
708 o->a_prefix, path);
709 strvec_pushf(&cp.args, "--dst-prefix=%s%s/",
710 o->b_prefix, path);
712 strvec_push(&cp.args, oid_to_hex(old_oid));
714 * If the submodule has modified content, we will diff against the
715 * work tree, under the assumption that the user has asked for the
716 * diff format and wishes to actually see all differences even if they
717 * haven't yet been committed to the submodule yet.
719 if (!(dirty_submodule & DIRTY_SUBMODULE_MODIFIED))
720 strvec_push(&cp.args, oid_to_hex(new_oid));
722 prepare_submodule_repo_env(&cp.env);
724 if (!is_directory(path)) {
725 /* fall back to absorbed git dir, if any */
726 if (!sub)
727 goto done;
728 cp.dir = sub->gitdir;
729 strvec_push(&cp.env, GIT_DIR_ENVIRONMENT "=.");
730 strvec_push(&cp.env, GIT_WORK_TREE_ENVIRONMENT "=.");
733 if (start_command(&cp)) {
734 diff_emit_submodule_error(o, "(diff failed)\n");
735 goto done;
738 while (strbuf_getwholeline_fd(&sb, cp.out, '\n') != EOF)
739 diff_emit_submodule_pipethrough(o, sb.buf, sb.len);
741 if (finish_command(&cp))
742 diff_emit_submodule_error(o, "(diff failed)\n");
744 done:
745 strbuf_release(&sb);
746 free_commit_list(merge_bases);
747 if (left)
748 clear_commit_marks(left, ~0);
749 if (right)
750 clear_commit_marks(right, ~0);
751 if (sub) {
752 repo_clear(sub);
753 free(sub);
757 int should_update_submodules(void)
759 return config_update_recurse_submodules == RECURSE_SUBMODULES_ON;
762 const struct submodule *submodule_from_ce(const struct cache_entry *ce)
764 if (!S_ISGITLINK(ce->ce_mode))
765 return NULL;
767 if (!should_update_submodules())
768 return NULL;
770 return submodule_from_path(the_repository, null_oid(), ce->name);
774 struct collect_changed_submodules_cb_data {
775 struct repository *repo;
776 struct string_list *changed;
777 const struct object_id *commit_oid;
781 * this would normally be two functions: default_name_from_path() and
782 * path_from_default_name(). Since the default name is the same as
783 * the submodule path we can get away with just one function which only
784 * checks whether there is a submodule in the working directory at that
785 * location.
787 static const char *default_name_or_path(const char *path_or_name)
789 int error_code;
791 if (!is_submodule_populated_gently(path_or_name, &error_code))
792 return NULL;
794 return path_or_name;
798 * Holds relevant information for a changed submodule. Used as the .util
799 * member of the changed submodule name string_list_item.
801 * (super_oid, path) allows the submodule config to be read from _some_
802 * .gitmodules file. We store this information the first time we find a
803 * superproject commit that points to the submodule, but this is
804 * arbitrary - we can choose any (super_oid, path) that matches the
805 * submodule's name.
807 * NEEDSWORK: Storing an arbitrary commit is undesirable because we can't
808 * guarantee that we're reading the commit that the user would expect. A better
809 * scheme would be to just fetch a submodule by its name. This requires two
810 * steps:
811 * - Create a function that behaves like repo_submodule_init(), but accepts a
812 * submodule name instead of treeish_name and path. This should be easy
813 * because repo_submodule_init() internally uses the submodule's name.
815 * - Replace most instances of 'struct submodule' (which is the .gitmodules
816 * config) with just the submodule name. This is OK because we expect
817 * submodule settings to be stored in .git/config (via "git submodule init"),
818 * not .gitmodules. This also lets us delete get_non_gitmodules_submodule(),
819 * which constructs a bogus 'struct submodule' for the sake of giving a
820 * placeholder name to a gitlink.
822 struct changed_submodule_data {
824 * The first superproject commit in the rev walk that points to
825 * the submodule.
827 const struct object_id *super_oid;
829 * Path to the submodule in the superproject commit referenced
830 * by 'super_oid'.
832 char *path;
833 /* The submodule commits that have changed in the rev walk. */
834 struct oid_array new_commits;
837 static void changed_submodule_data_clear(struct changed_submodule_data *cs_data)
839 oid_array_clear(&cs_data->new_commits);
840 free(cs_data->path);
843 static void collect_changed_submodules_cb(struct diff_queue_struct *q,
844 struct diff_options *options UNUSED,
845 void *data)
847 struct collect_changed_submodules_cb_data *me = data;
848 struct string_list *changed = me->changed;
849 const struct object_id *commit_oid = me->commit_oid;
850 int i;
852 for (i = 0; i < q->nr; i++) {
853 struct diff_filepair *p = q->queue[i];
854 const struct submodule *submodule;
855 const char *name;
856 struct string_list_item *item;
857 struct changed_submodule_data *cs_data;
859 if (!S_ISGITLINK(p->two->mode))
860 continue;
862 submodule = submodule_from_path(me->repo,
863 commit_oid, p->two->path);
864 if (submodule)
865 name = submodule->name;
866 else {
867 name = default_name_or_path(p->two->path);
868 /* make sure name does not collide with existing one */
869 if (name)
870 submodule = submodule_from_name(me->repo,
871 commit_oid, name);
872 if (submodule) {
873 warning(_("Submodule in commit %s at path: "
874 "'%s' collides with a submodule named "
875 "the same. Skipping it."),
876 oid_to_hex(commit_oid), p->two->path);
877 name = NULL;
881 if (!name)
882 continue;
884 item = string_list_insert(changed, name);
885 if (item->util)
886 cs_data = item->util;
887 else {
888 item->util = xcalloc(1, sizeof(struct changed_submodule_data));
889 cs_data = item->util;
890 cs_data->super_oid = commit_oid;
891 cs_data->path = xstrdup(p->two->path);
893 oid_array_append(&cs_data->new_commits, &p->two->oid);
898 * Collect the paths of submodules in 'changed' which have changed based on
899 * the revisions as specified in 'argv'. Each entry in 'changed' will also
900 * have a corresponding 'struct oid_array' (in the 'util' field) which lists
901 * what the submodule pointers were updated to during the change.
903 static void collect_changed_submodules(struct repository *r,
904 struct string_list *changed,
905 struct strvec *argv)
907 struct rev_info rev;
908 const struct commit *commit;
909 int save_warning;
910 struct setup_revision_opt s_r_opt = {
911 .assume_dashdash = 1,
914 save_warning = warn_on_object_refname_ambiguity;
915 warn_on_object_refname_ambiguity = 0;
916 repo_init_revisions(r, &rev, NULL);
917 setup_revisions(argv->nr, argv->v, &rev, &s_r_opt);
918 warn_on_object_refname_ambiguity = save_warning;
919 if (prepare_revision_walk(&rev))
920 die(_("revision walk setup failed"));
922 while ((commit = get_revision(&rev))) {
923 struct rev_info diff_rev;
924 struct collect_changed_submodules_cb_data data;
925 data.repo = r;
926 data.changed = changed;
927 data.commit_oid = &commit->object.oid;
929 repo_init_revisions(r, &diff_rev, NULL);
930 diff_rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
931 diff_rev.diffopt.format_callback = collect_changed_submodules_cb;
932 diff_rev.diffopt.format_callback_data = &data;
933 diff_rev.dense_combined_merges = 1;
934 diff_tree_combined_merge(commit, &diff_rev);
935 release_revisions(&diff_rev);
938 reset_revision_walk();
939 release_revisions(&rev);
942 static void free_submodules_data(struct string_list *submodules)
944 struct string_list_item *item;
945 for_each_string_list_item(item, submodules)
946 changed_submodule_data_clear(item->util);
948 string_list_clear(submodules, 1);
951 static int has_remote(const char *refname UNUSED,
952 const struct object_id *oid UNUSED,
953 int flags UNUSED, void *cb_data UNUSED)
955 return 1;
958 static int append_oid_to_argv(const struct object_id *oid, void *data)
960 struct strvec *argv = data;
961 strvec_push(argv, oid_to_hex(oid));
962 return 0;
965 struct has_commit_data {
966 struct repository *repo;
967 int result;
968 const char *path;
969 const struct object_id *super_oid;
972 static int check_has_commit(const struct object_id *oid, void *data)
974 struct has_commit_data *cb = data;
975 struct repository subrepo;
976 enum object_type type;
978 if (repo_submodule_init(&subrepo, cb->repo, cb->path, cb->super_oid)) {
979 cb->result = 0;
980 /* subrepo failed to init, so don't clean it up. */
981 return 0;
984 type = oid_object_info(&subrepo, oid, NULL);
986 switch (type) {
987 case OBJ_COMMIT:
988 goto cleanup;
989 case OBJ_BAD:
991 * Object is missing or invalid. If invalid, an error message
992 * has already been printed.
994 cb->result = 0;
995 goto cleanup;
996 default:
997 die(_("submodule entry '%s' (%s) is a %s, not a commit"),
998 cb->path, oid_to_hex(oid), type_name(type));
1000 cleanup:
1001 repo_clear(&subrepo);
1002 return 0;
1005 static int submodule_has_commits(struct repository *r,
1006 const char *path,
1007 const struct object_id *super_oid,
1008 struct oid_array *commits)
1010 struct has_commit_data has_commit = {
1011 .repo = r,
1012 .result = 1,
1013 .path = path,
1014 .super_oid = super_oid
1017 oid_array_for_each_unique(commits, check_has_commit, &has_commit);
1019 if (has_commit.result) {
1021 * Even if the submodule is checked out and the commit is
1022 * present, make sure it exists in the submodule's object store
1023 * and that it is reachable from a ref.
1025 struct child_process cp = CHILD_PROCESS_INIT;
1026 struct strbuf out = STRBUF_INIT;
1028 strvec_pushl(&cp.args, "rev-list", "-n", "1", NULL);
1029 oid_array_for_each_unique(commits, append_oid_to_argv, &cp.args);
1030 strvec_pushl(&cp.args, "--not", "--all", NULL);
1032 prepare_submodule_repo_env(&cp.env);
1033 cp.git_cmd = 1;
1034 cp.no_stdin = 1;
1035 cp.dir = path;
1037 if (capture_command(&cp, &out, GIT_MAX_HEXSZ + 1) || out.len)
1038 has_commit.result = 0;
1040 strbuf_release(&out);
1043 return has_commit.result;
1046 static int submodule_needs_pushing(struct repository *r,
1047 const char *path,
1048 struct oid_array *commits)
1050 if (!submodule_has_commits(r, path, null_oid(), commits))
1052 * NOTE: We do consider it safe to return "no" here. The
1053 * correct answer would be "We do not know" instead of
1054 * "No push needed", but it is quite hard to change
1055 * the submodule pointer without having the submodule
1056 * around. If a user did however change the submodules
1057 * without having the submodule around, this indicates
1058 * an expert who knows what they are doing or a
1059 * maintainer integrating work from other people. In
1060 * both cases it should be safe to skip this check.
1062 return 0;
1064 if (for_each_remote_ref_submodule(path, has_remote, NULL) > 0) {
1065 struct child_process cp = CHILD_PROCESS_INIT;
1066 struct strbuf buf = STRBUF_INIT;
1067 int needs_pushing = 0;
1069 strvec_push(&cp.args, "rev-list");
1070 oid_array_for_each_unique(commits, append_oid_to_argv, &cp.args);
1071 strvec_pushl(&cp.args, "--not", "--remotes", "-n", "1" , NULL);
1073 prepare_submodule_repo_env(&cp.env);
1074 cp.git_cmd = 1;
1075 cp.no_stdin = 1;
1076 cp.out = -1;
1077 cp.dir = path;
1078 if (start_command(&cp))
1079 die(_("Could not run 'git rev-list <commits> --not --remotes -n 1' command in submodule %s"),
1080 path);
1081 if (strbuf_read(&buf, cp.out, the_hash_algo->hexsz + 1))
1082 needs_pushing = 1;
1083 finish_command(&cp);
1084 close(cp.out);
1085 strbuf_release(&buf);
1086 return needs_pushing;
1089 return 0;
1092 int find_unpushed_submodules(struct repository *r,
1093 struct oid_array *commits,
1094 const char *remotes_name,
1095 struct string_list *needs_pushing)
1097 struct string_list submodules = STRING_LIST_INIT_DUP;
1098 struct string_list_item *name;
1099 struct strvec argv = STRVEC_INIT;
1101 /* argv.v[0] will be ignored by setup_revisions */
1102 strvec_push(&argv, "find_unpushed_submodules");
1103 oid_array_for_each_unique(commits, append_oid_to_argv, &argv);
1104 strvec_push(&argv, "--not");
1105 strvec_pushf(&argv, "--remotes=%s", remotes_name);
1107 collect_changed_submodules(r, &submodules, &argv);
1109 for_each_string_list_item(name, &submodules) {
1110 struct changed_submodule_data *cs_data = name->util;
1111 const struct submodule *submodule;
1112 const char *path = NULL;
1114 submodule = submodule_from_name(r, null_oid(), name->string);
1115 if (submodule)
1116 path = submodule->path;
1117 else
1118 path = default_name_or_path(name->string);
1120 if (!path)
1121 continue;
1123 if (submodule_needs_pushing(r, path, &cs_data->new_commits))
1124 string_list_insert(needs_pushing, path);
1127 free_submodules_data(&submodules);
1128 strvec_clear(&argv);
1130 return needs_pushing->nr;
1133 static int push_submodule(const char *path,
1134 const struct remote *remote,
1135 const struct refspec *rs,
1136 const struct string_list *push_options,
1137 int dry_run)
1139 if (for_each_remote_ref_submodule(path, has_remote, NULL) > 0) {
1140 struct child_process cp = CHILD_PROCESS_INIT;
1141 strvec_push(&cp.args, "push");
1143 * When recursing into a submodule, treat any "only" configurations as "on-
1144 * demand", since "only" would not work (we need all submodules to be pushed
1145 * in order to be able to push the superproject).
1147 strvec_push(&cp.args, "--recurse-submodules=only-is-on-demand");
1148 if (dry_run)
1149 strvec_push(&cp.args, "--dry-run");
1151 if (push_options && push_options->nr) {
1152 const struct string_list_item *item;
1153 for_each_string_list_item(item, push_options)
1154 strvec_pushf(&cp.args, "--push-option=%s",
1155 item->string);
1158 if (remote->origin != REMOTE_UNCONFIGURED) {
1159 int i;
1160 strvec_push(&cp.args, remote->name);
1161 for (i = 0; i < rs->raw_nr; i++)
1162 strvec_push(&cp.args, rs->raw[i]);
1165 prepare_submodule_repo_env(&cp.env);
1166 cp.git_cmd = 1;
1167 cp.no_stdin = 1;
1168 cp.dir = path;
1169 if (run_command(&cp))
1170 return 0;
1171 close(cp.out);
1174 return 1;
1178 * Perform a check in the submodule to see if the remote and refspec work.
1179 * Die if the submodule can't be pushed.
1181 static void submodule_push_check(const char *path, const char *head,
1182 const struct remote *remote,
1183 const struct refspec *rs)
1185 struct child_process cp = CHILD_PROCESS_INIT;
1186 int i;
1188 strvec_push(&cp.args, "submodule--helper");
1189 strvec_push(&cp.args, "push-check");
1190 strvec_push(&cp.args, head);
1191 strvec_push(&cp.args, remote->name);
1193 for (i = 0; i < rs->raw_nr; i++)
1194 strvec_push(&cp.args, rs->raw[i]);
1196 prepare_submodule_repo_env(&cp.env);
1197 cp.git_cmd = 1;
1198 cp.no_stdin = 1;
1199 cp.no_stdout = 1;
1200 cp.dir = path;
1203 * Simply indicate if 'submodule--helper push-check' failed.
1204 * More detailed error information will be provided by the
1205 * child process.
1207 if (run_command(&cp))
1208 die(_("process for submodule '%s' failed"), path);
1211 int push_unpushed_submodules(struct repository *r,
1212 struct oid_array *commits,
1213 const struct remote *remote,
1214 const struct refspec *rs,
1215 const struct string_list *push_options,
1216 int dry_run)
1218 int i, ret = 1;
1219 struct string_list needs_pushing = STRING_LIST_INIT_DUP;
1221 if (!find_unpushed_submodules(r, commits,
1222 remote->name, &needs_pushing))
1223 return 1;
1226 * Verify that the remote and refspec can be propagated to all
1227 * submodules. This check can be skipped if the remote and refspec
1228 * won't be propagated due to the remote being unconfigured (e.g. a URL
1229 * instead of a remote name).
1231 if (remote->origin != REMOTE_UNCONFIGURED) {
1232 char *head;
1233 struct object_id head_oid;
1235 head = resolve_refdup("HEAD", 0, &head_oid, NULL);
1236 if (!head)
1237 die(_("Failed to resolve HEAD as a valid ref."));
1239 for (i = 0; i < needs_pushing.nr; i++)
1240 submodule_push_check(needs_pushing.items[i].string,
1241 head, remote, rs);
1242 free(head);
1245 /* Actually push the submodules */
1246 for (i = 0; i < needs_pushing.nr; i++) {
1247 const char *path = needs_pushing.items[i].string;
1248 fprintf(stderr, _("Pushing submodule '%s'\n"), path);
1249 if (!push_submodule(path, remote, rs,
1250 push_options, dry_run)) {
1251 fprintf(stderr, _("Unable to push submodule '%s'\n"), path);
1252 ret = 0;
1256 string_list_clear(&needs_pushing, 0);
1258 return ret;
1261 static int append_oid_to_array(const char *ref UNUSED,
1262 const struct object_id *oid,
1263 int flags UNUSED, void *data)
1265 struct oid_array *array = data;
1266 oid_array_append(array, oid);
1267 return 0;
1270 void check_for_new_submodule_commits(struct object_id *oid)
1272 if (!initialized_fetch_ref_tips) {
1273 for_each_ref(append_oid_to_array, &ref_tips_before_fetch);
1274 initialized_fetch_ref_tips = 1;
1277 oid_array_append(&ref_tips_after_fetch, oid);
1281 * Returns 1 if there is at least one submodule gitdir in
1282 * $GIT_DIR/modules and 0 otherwise. This follows
1283 * submodule_name_to_gitdir(), which looks for submodules in
1284 * $GIT_DIR/modules, not $GIT_COMMON_DIR.
1286 * A submodule can be moved to $GIT_DIR/modules manually by running "git
1287 * submodule absorbgitdirs", or it may be initialized there by "git
1288 * submodule update".
1290 static int repo_has_absorbed_submodules(struct repository *r)
1292 int ret;
1293 struct strbuf buf = STRBUF_INIT;
1295 strbuf_repo_git_path(&buf, r, "modules/");
1296 ret = file_exists(buf.buf) && !is_empty_dir(buf.buf);
1297 strbuf_release(&buf);
1298 return ret;
1301 static void calculate_changed_submodule_paths(struct repository *r,
1302 struct string_list *changed_submodule_names)
1304 struct strvec argv = STRVEC_INIT;
1305 struct string_list_item *name;
1307 /* No need to check if no submodules would be fetched */
1308 if (!submodule_from_path(r, NULL, NULL) &&
1309 !repo_has_absorbed_submodules(r))
1310 return;
1312 strvec_push(&argv, "--"); /* argv[0] program name */
1313 oid_array_for_each_unique(&ref_tips_after_fetch,
1314 append_oid_to_argv, &argv);
1315 strvec_push(&argv, "--not");
1316 oid_array_for_each_unique(&ref_tips_before_fetch,
1317 append_oid_to_argv, &argv);
1320 * Collect all submodules (whether checked out or not) for which new
1321 * commits have been recorded upstream in "changed_submodule_names".
1323 collect_changed_submodules(r, changed_submodule_names, &argv);
1325 for_each_string_list_item(name, changed_submodule_names) {
1326 struct changed_submodule_data *cs_data = name->util;
1327 const struct submodule *submodule;
1328 const char *path = NULL;
1330 submodule = submodule_from_name(r, null_oid(), name->string);
1331 if (submodule)
1332 path = submodule->path;
1333 else
1334 path = default_name_or_path(name->string);
1336 if (!path)
1337 continue;
1339 if (submodule_has_commits(r, path, null_oid(), &cs_data->new_commits)) {
1340 changed_submodule_data_clear(cs_data);
1341 *name->string = '\0';
1345 string_list_remove_empty_items(changed_submodule_names, 1);
1347 strvec_clear(&argv);
1348 oid_array_clear(&ref_tips_before_fetch);
1349 oid_array_clear(&ref_tips_after_fetch);
1350 initialized_fetch_ref_tips = 0;
1353 int submodule_touches_in_range(struct repository *r,
1354 struct object_id *excl_oid,
1355 struct object_id *incl_oid)
1357 struct string_list subs = STRING_LIST_INIT_DUP;
1358 struct strvec args = STRVEC_INIT;
1359 int ret;
1361 /* No need to check if there are no submodules configured */
1362 if (!submodule_from_path(r, NULL, NULL))
1363 return 0;
1365 strvec_push(&args, "--"); /* args[0] program name */
1366 strvec_push(&args, oid_to_hex(incl_oid));
1367 if (!is_null_oid(excl_oid)) {
1368 strvec_push(&args, "--not");
1369 strvec_push(&args, oid_to_hex(excl_oid));
1372 collect_changed_submodules(r, &subs, &args);
1373 ret = subs.nr;
1375 strvec_clear(&args);
1377 free_submodules_data(&subs);
1378 return ret;
1381 struct submodule_parallel_fetch {
1383 * The index of the last index entry processed by
1384 * get_fetch_task_from_index().
1386 int index_count;
1388 * The index of the last string_list entry processed by
1389 * get_fetch_task_from_changed().
1391 int changed_count;
1392 struct strvec args;
1393 struct repository *r;
1394 const char *prefix;
1395 int command_line_option;
1396 int default_option;
1397 int quiet;
1398 int result;
1401 * Names of submodules that have new commits. Generated by
1402 * walking the newly fetched superproject commits.
1404 struct string_list changed_submodule_names;
1406 * Names of submodules that have already been processed. Lets us
1407 * avoid fetching the same submodule more than once.
1409 struct string_list seen_submodule_names;
1411 /* Pending fetches by OIDs */
1412 struct fetch_task **oid_fetch_tasks;
1413 int oid_fetch_tasks_nr, oid_fetch_tasks_alloc;
1415 struct strbuf submodules_with_errors;
1417 #define SPF_INIT { \
1418 .args = STRVEC_INIT, \
1419 .changed_submodule_names = STRING_LIST_INIT_DUP, \
1420 .seen_submodule_names = STRING_LIST_INIT_DUP, \
1421 .submodules_with_errors = STRBUF_INIT, \
1424 static int get_fetch_recurse_config(const struct submodule *submodule,
1425 struct submodule_parallel_fetch *spf)
1427 if (spf->command_line_option != RECURSE_SUBMODULES_DEFAULT)
1428 return spf->command_line_option;
1430 if (submodule) {
1431 char *key;
1432 const char *value;
1434 int fetch_recurse = submodule->fetch_recurse;
1435 key = xstrfmt("submodule.%s.fetchRecurseSubmodules", submodule->name);
1436 if (!repo_config_get_string_tmp(spf->r, key, &value)) {
1437 fetch_recurse = parse_fetch_recurse_submodules_arg(key, value);
1439 free(key);
1441 if (fetch_recurse != RECURSE_SUBMODULES_NONE)
1442 /* local config overrules everything except commandline */
1443 return fetch_recurse;
1446 return spf->default_option;
1450 * Fetch in progress (if callback data) or
1451 * pending (if in oid_fetch_tasks in struct submodule_parallel_fetch)
1453 struct fetch_task {
1454 struct repository *repo;
1455 const struct submodule *sub;
1456 unsigned free_sub : 1; /* Do we need to free the submodule? */
1457 const char *default_argv; /* The default fetch mode. */
1458 struct strvec git_args; /* Args for the child git process. */
1460 struct oid_array *commits; /* Ensure these commits are fetched */
1464 * When a submodule is not defined in .gitmodules, we cannot access it
1465 * via the regular submodule-config. Create a fake submodule, which we can
1466 * work on.
1468 static const struct submodule *get_non_gitmodules_submodule(const char *path)
1470 struct submodule *ret = NULL;
1471 const char *name = default_name_or_path(path);
1473 if (!name)
1474 return NULL;
1476 ret = xmalloc(sizeof(*ret));
1477 memset(ret, 0, sizeof(*ret));
1478 ret->path = name;
1479 ret->name = name;
1481 return (const struct submodule *) ret;
1484 static void fetch_task_release(struct fetch_task *p)
1486 if (p->free_sub)
1487 free((void*)p->sub);
1488 p->free_sub = 0;
1489 p->sub = NULL;
1491 if (p->repo)
1492 repo_clear(p->repo);
1493 FREE_AND_NULL(p->repo);
1495 strvec_clear(&p->git_args);
1498 static struct repository *get_submodule_repo_for(struct repository *r,
1499 const char *path,
1500 const struct object_id *treeish_name)
1502 struct repository *ret = xmalloc(sizeof(*ret));
1504 if (repo_submodule_init(ret, r, path, treeish_name)) {
1505 free(ret);
1506 return NULL;
1509 return ret;
1512 static struct fetch_task *fetch_task_create(struct submodule_parallel_fetch *spf,
1513 const char *path,
1514 const struct object_id *treeish_name)
1516 struct fetch_task *task = xmalloc(sizeof(*task));
1517 memset(task, 0, sizeof(*task));
1519 task->sub = submodule_from_path(spf->r, treeish_name, path);
1521 if (!task->sub) {
1523 * No entry in .gitmodules? Technically not a submodule,
1524 * but historically we supported repositories that happen to be
1525 * in-place where a gitlink is. Keep supporting them.
1527 task->sub = get_non_gitmodules_submodule(path);
1528 if (!task->sub)
1529 goto cleanup;
1531 task->free_sub = 1;
1534 if (string_list_lookup(&spf->seen_submodule_names, task->sub->name))
1535 goto cleanup;
1537 switch (get_fetch_recurse_config(task->sub, spf))
1539 default:
1540 case RECURSE_SUBMODULES_DEFAULT:
1541 case RECURSE_SUBMODULES_ON_DEMAND:
1542 if (!task->sub ||
1543 !string_list_lookup(
1544 &spf->changed_submodule_names,
1545 task->sub->name))
1546 goto cleanup;
1547 task->default_argv = "on-demand";
1548 break;
1549 case RECURSE_SUBMODULES_ON:
1550 task->default_argv = "yes";
1551 break;
1552 case RECURSE_SUBMODULES_OFF:
1553 goto cleanup;
1556 task->repo = get_submodule_repo_for(spf->r, path, treeish_name);
1558 return task;
1560 cleanup:
1561 fetch_task_release(task);
1562 free(task);
1563 return NULL;
1566 static struct fetch_task *
1567 get_fetch_task_from_index(struct submodule_parallel_fetch *spf,
1568 struct strbuf *err)
1570 for (; spf->index_count < spf->r->index->cache_nr; spf->index_count++) {
1571 const struct cache_entry *ce =
1572 spf->r->index->cache[spf->index_count];
1573 struct fetch_task *task;
1575 if (!S_ISGITLINK(ce->ce_mode))
1576 continue;
1578 task = fetch_task_create(spf, ce->name, null_oid());
1579 if (!task)
1580 continue;
1582 if (task->repo) {
1583 if (!spf->quiet)
1584 strbuf_addf(err, _("Fetching submodule %s%s\n"),
1585 spf->prefix, ce->name);
1587 spf->index_count++;
1588 return task;
1589 } else {
1590 struct strbuf empty_submodule_path = STRBUF_INIT;
1592 fetch_task_release(task);
1593 free(task);
1596 * An empty directory is normal,
1597 * the submodule is not initialized
1599 strbuf_addf(&empty_submodule_path, "%s/%s/",
1600 spf->r->worktree,
1601 ce->name);
1602 if (S_ISGITLINK(ce->ce_mode) &&
1603 !is_empty_dir(empty_submodule_path.buf)) {
1604 spf->result = 1;
1605 strbuf_addf(err,
1606 _("Could not access submodule '%s'\n"),
1607 ce->name);
1609 strbuf_release(&empty_submodule_path);
1612 return NULL;
1615 static struct fetch_task *
1616 get_fetch_task_from_changed(struct submodule_parallel_fetch *spf,
1617 struct strbuf *err)
1619 for (; spf->changed_count < spf->changed_submodule_names.nr;
1620 spf->changed_count++) {
1621 struct string_list_item item =
1622 spf->changed_submodule_names.items[spf->changed_count];
1623 struct changed_submodule_data *cs_data = item.util;
1624 struct fetch_task *task;
1626 if (!is_tree_submodule_active(spf->r, cs_data->super_oid,cs_data->path))
1627 continue;
1629 task = fetch_task_create(spf, cs_data->path,
1630 cs_data->super_oid);
1631 if (!task)
1632 continue;
1634 if (!task->repo) {
1635 strbuf_addf(err, _("Could not access submodule '%s' at commit %s\n"),
1636 cs_data->path,
1637 repo_find_unique_abbrev(the_repository, cs_data->super_oid, DEFAULT_ABBREV));
1639 fetch_task_release(task);
1640 free(task);
1641 continue;
1644 if (!spf->quiet)
1645 strbuf_addf(err,
1646 _("Fetching submodule %s%s at commit %s\n"),
1647 spf->prefix, task->sub->path,
1648 repo_find_unique_abbrev(the_repository, cs_data->super_oid,
1649 DEFAULT_ABBREV));
1651 spf->changed_count++;
1653 * NEEDSWORK: Submodules set/unset a value for
1654 * core.worktree when they are populated/unpopulated by
1655 * "git checkout" (and similar commands, see
1656 * submodule_move_head() and
1657 * connect_work_tree_and_git_dir()), but if the
1658 * submodule is unpopulated in another way (e.g. "git
1659 * rm", "rm -r"), core.worktree will still be set even
1660 * though the directory doesn't exist, and the child
1661 * process will crash while trying to chdir into the
1662 * nonexistent directory.
1664 * In this case, we know that the submodule has no
1665 * working tree, so we can work around this by
1666 * setting "--work-tree=." (--bare does not work because
1667 * worktree settings take precedence over bare-ness).
1668 * However, this is not necessarily true in other cases,
1669 * so a generalized solution is still necessary.
1671 * Possible solutions:
1672 * - teach "git [add|rm]" to unset core.worktree and
1673 * discourage users from removing submodules without
1674 * using a Git command.
1675 * - teach submodule child processes to ignore stale
1676 * core.worktree values.
1678 strvec_push(&task->git_args, "--work-tree=.");
1679 return task;
1681 return NULL;
1684 static int get_next_submodule(struct child_process *cp, struct strbuf *err,
1685 void *data, void **task_cb)
1687 struct submodule_parallel_fetch *spf = data;
1688 struct fetch_task *task =
1689 get_fetch_task_from_index(spf, err);
1690 if (!task)
1691 task = get_fetch_task_from_changed(spf, err);
1693 if (task) {
1694 struct strbuf submodule_prefix = STRBUF_INIT;
1696 child_process_init(cp);
1697 cp->dir = task->repo->gitdir;
1698 prepare_submodule_repo_env_in_gitdir(&cp->env);
1699 cp->git_cmd = 1;
1700 strvec_init(&cp->args);
1701 if (task->git_args.nr)
1702 strvec_pushv(&cp->args, task->git_args.v);
1703 strvec_pushv(&cp->args, spf->args.v);
1704 strvec_push(&cp->args, task->default_argv);
1705 strvec_push(&cp->args, "--submodule-prefix");
1707 strbuf_addf(&submodule_prefix, "%s%s/",
1708 spf->prefix,
1709 task->sub->path);
1710 strvec_push(&cp->args, submodule_prefix.buf);
1711 *task_cb = task;
1713 strbuf_release(&submodule_prefix);
1714 string_list_insert(&spf->seen_submodule_names, task->sub->name);
1715 return 1;
1718 if (spf->oid_fetch_tasks_nr) {
1719 struct fetch_task *task =
1720 spf->oid_fetch_tasks[spf->oid_fetch_tasks_nr - 1];
1721 struct strbuf submodule_prefix = STRBUF_INIT;
1722 spf->oid_fetch_tasks_nr--;
1724 strbuf_addf(&submodule_prefix, "%s%s/",
1725 spf->prefix, task->sub->path);
1727 child_process_init(cp);
1728 prepare_submodule_repo_env_in_gitdir(&cp->env);
1729 cp->git_cmd = 1;
1730 cp->dir = task->repo->gitdir;
1732 strvec_init(&cp->args);
1733 strvec_pushv(&cp->args, spf->args.v);
1734 strvec_push(&cp->args, "on-demand");
1735 strvec_push(&cp->args, "--submodule-prefix");
1736 strvec_push(&cp->args, submodule_prefix.buf);
1738 /* NEEDSWORK: have get_default_remote from submodule--helper */
1739 strvec_push(&cp->args, "origin");
1740 oid_array_for_each_unique(task->commits,
1741 append_oid_to_argv, &cp->args);
1743 *task_cb = task;
1744 strbuf_release(&submodule_prefix);
1745 return 1;
1748 return 0;
1751 static int fetch_start_failure(struct strbuf *err UNUSED,
1752 void *cb, void *task_cb)
1754 struct submodule_parallel_fetch *spf = cb;
1755 struct fetch_task *task = task_cb;
1757 spf->result = 1;
1759 fetch_task_release(task);
1760 return 0;
1763 static int commit_missing_in_sub(const struct object_id *oid, void *data)
1765 struct repository *subrepo = data;
1767 enum object_type type = oid_object_info(subrepo, oid, NULL);
1769 return type != OBJ_COMMIT;
1772 static int fetch_finish(int retvalue, struct strbuf *err UNUSED,
1773 void *cb, void *task_cb)
1775 struct submodule_parallel_fetch *spf = cb;
1776 struct fetch_task *task = task_cb;
1778 struct string_list_item *it;
1779 struct changed_submodule_data *cs_data;
1781 if (!task || !task->sub)
1782 BUG("callback cookie bogus");
1784 if (retvalue) {
1786 * NEEDSWORK: This indicates that the overall fetch
1787 * failed, even though there may be a subsequent fetch
1788 * by commit hash that might work. It may be a good
1789 * idea to not indicate failure in this case, and only
1790 * indicate failure if the subsequent fetch fails.
1792 spf->result = 1;
1794 strbuf_addf(&spf->submodules_with_errors, "\t%s\n",
1795 task->sub->name);
1798 /* Is this the second time we process this submodule? */
1799 if (task->commits)
1800 goto out;
1802 it = string_list_lookup(&spf->changed_submodule_names, task->sub->name);
1803 if (!it)
1804 /* Could be an unchanged submodule, not contained in the list */
1805 goto out;
1807 cs_data = it->util;
1808 oid_array_filter(&cs_data->new_commits,
1809 commit_missing_in_sub,
1810 task->repo);
1812 /* Are there commits we want, but do not exist? */
1813 if (cs_data->new_commits.nr) {
1814 task->commits = &cs_data->new_commits;
1815 ALLOC_GROW(spf->oid_fetch_tasks,
1816 spf->oid_fetch_tasks_nr + 1,
1817 spf->oid_fetch_tasks_alloc);
1818 spf->oid_fetch_tasks[spf->oid_fetch_tasks_nr] = task;
1819 spf->oid_fetch_tasks_nr++;
1820 return 0;
1823 out:
1824 fetch_task_release(task);
1826 return 0;
1829 int fetch_submodules(struct repository *r,
1830 const struct strvec *options,
1831 const char *prefix, int command_line_option,
1832 int default_option,
1833 int quiet, int max_parallel_jobs)
1835 int i;
1836 struct submodule_parallel_fetch spf = SPF_INIT;
1837 const struct run_process_parallel_opts opts = {
1838 .tr2_category = "submodule",
1839 .tr2_label = "parallel/fetch",
1841 .processes = max_parallel_jobs,
1843 .get_next_task = get_next_submodule,
1844 .start_failure = fetch_start_failure,
1845 .task_finished = fetch_finish,
1846 .data = &spf,
1849 spf.r = r;
1850 spf.command_line_option = command_line_option;
1851 spf.default_option = default_option;
1852 spf.quiet = quiet;
1853 spf.prefix = prefix;
1855 if (!r->worktree)
1856 goto out;
1858 if (repo_read_index(r) < 0)
1859 die(_("index file corrupt"));
1861 strvec_push(&spf.args, "fetch");
1862 for (i = 0; i < options->nr; i++)
1863 strvec_push(&spf.args, options->v[i]);
1864 strvec_push(&spf.args, "--recurse-submodules-default");
1865 /* default value, "--submodule-prefix" and its value are added later */
1867 calculate_changed_submodule_paths(r, &spf.changed_submodule_names);
1868 string_list_sort(&spf.changed_submodule_names);
1869 run_processes_parallel(&opts);
1871 if (spf.submodules_with_errors.len > 0)
1872 fprintf(stderr, _("Errors during submodule fetch:\n%s"),
1873 spf.submodules_with_errors.buf);
1876 strvec_clear(&spf.args);
1877 out:
1878 free_submodules_data(&spf.changed_submodule_names);
1879 return spf.result;
1882 unsigned is_submodule_modified(const char *path, int ignore_untracked)
1884 struct child_process cp = CHILD_PROCESS_INIT;
1885 struct strbuf buf = STRBUF_INIT;
1886 FILE *fp;
1887 unsigned dirty_submodule = 0;
1888 const char *git_dir;
1889 int ignore_cp_exit_code = 0;
1891 strbuf_addf(&buf, "%s/.git", path);
1892 git_dir = read_gitfile(buf.buf);
1893 if (!git_dir)
1894 git_dir = buf.buf;
1895 if (!is_git_directory(git_dir)) {
1896 if (is_directory(git_dir))
1897 die(_("'%s' not recognized as a git repository"), git_dir);
1898 strbuf_release(&buf);
1899 /* The submodule is not checked out, so it is not modified */
1900 return 0;
1902 strbuf_reset(&buf);
1904 strvec_pushl(&cp.args, "status", "--porcelain=2", NULL);
1905 if (ignore_untracked)
1906 strvec_push(&cp.args, "-uno");
1908 prepare_submodule_repo_env(&cp.env);
1909 cp.git_cmd = 1;
1910 cp.no_stdin = 1;
1911 cp.out = -1;
1912 cp.dir = path;
1913 if (start_command(&cp))
1914 die(_("Could not run 'git status --porcelain=2' in submodule %s"), path);
1916 fp = xfdopen(cp.out, "r");
1917 while (strbuf_getwholeline(&buf, fp, '\n') != EOF) {
1918 /* regular untracked files */
1919 if (buf.buf[0] == '?')
1920 dirty_submodule |= DIRTY_SUBMODULE_UNTRACKED;
1922 if (buf.buf[0] == 'u' ||
1923 buf.buf[0] == '1' ||
1924 buf.buf[0] == '2') {
1925 /* T = line type, XY = status, SSSS = submodule state */
1926 if (buf.len < strlen("T XY SSSS"))
1927 BUG("invalid status --porcelain=2 line %s",
1928 buf.buf);
1930 if (buf.buf[5] == 'S' && buf.buf[8] == 'U')
1931 /* nested untracked file */
1932 dirty_submodule |= DIRTY_SUBMODULE_UNTRACKED;
1934 if (buf.buf[0] == 'u' ||
1935 buf.buf[0] == '2' ||
1936 memcmp(buf.buf + 5, "S..U", 4))
1937 /* other change */
1938 dirty_submodule |= DIRTY_SUBMODULE_MODIFIED;
1941 if ((dirty_submodule & DIRTY_SUBMODULE_MODIFIED) &&
1942 ((dirty_submodule & DIRTY_SUBMODULE_UNTRACKED) ||
1943 ignore_untracked)) {
1945 * We're not interested in any further information from
1946 * the child any more, neither output nor its exit code.
1948 ignore_cp_exit_code = 1;
1949 break;
1952 fclose(fp);
1954 if (finish_command(&cp) && !ignore_cp_exit_code)
1955 die(_("'git status --porcelain=2' failed in submodule %s"), path);
1957 strbuf_release(&buf);
1958 return dirty_submodule;
1961 int submodule_uses_gitfile(const char *path)
1963 struct child_process cp = CHILD_PROCESS_INIT;
1964 struct strbuf buf = STRBUF_INIT;
1965 const char *git_dir;
1967 strbuf_addf(&buf, "%s/.git", path);
1968 git_dir = read_gitfile(buf.buf);
1969 if (!git_dir) {
1970 strbuf_release(&buf);
1971 return 0;
1973 strbuf_release(&buf);
1975 /* Now test that all nested submodules use a gitfile too */
1976 strvec_pushl(&cp.args,
1977 "submodule", "foreach", "--quiet", "--recursive",
1978 "test -f .git", NULL);
1980 prepare_submodule_repo_env(&cp.env);
1981 cp.git_cmd = 1;
1982 cp.no_stdin = 1;
1983 cp.no_stderr = 1;
1984 cp.no_stdout = 1;
1985 cp.dir = path;
1986 if (run_command(&cp))
1987 return 0;
1989 return 1;
1993 * Check if it is a bad idea to remove a submodule, i.e. if we'd lose data
1994 * when doing so.
1996 * Return 1 if we'd lose data, return 0 if the removal is fine,
1997 * and negative values for errors.
1999 int bad_to_remove_submodule(const char *path, unsigned flags)
2001 ssize_t len;
2002 struct child_process cp = CHILD_PROCESS_INIT;
2003 struct strbuf buf = STRBUF_INIT;
2004 int ret = 0;
2006 if (!file_exists(path) || is_empty_dir(path))
2007 return 0;
2009 if (!submodule_uses_gitfile(path))
2010 return 1;
2012 strvec_pushl(&cp.args, "status", "--porcelain",
2013 "--ignore-submodules=none", NULL);
2015 if (flags & SUBMODULE_REMOVAL_IGNORE_UNTRACKED)
2016 strvec_push(&cp.args, "-uno");
2017 else
2018 strvec_push(&cp.args, "-uall");
2020 if (!(flags & SUBMODULE_REMOVAL_IGNORE_IGNORED_UNTRACKED))
2021 strvec_push(&cp.args, "--ignored");
2023 prepare_submodule_repo_env(&cp.env);
2024 cp.git_cmd = 1;
2025 cp.no_stdin = 1;
2026 cp.out = -1;
2027 cp.dir = path;
2028 if (start_command(&cp)) {
2029 if (flags & SUBMODULE_REMOVAL_DIE_ON_ERROR)
2030 die(_("could not start 'git status' in submodule '%s'"),
2031 path);
2032 ret = -1;
2033 goto out;
2036 len = strbuf_read(&buf, cp.out, 1024);
2037 if (len > 2)
2038 ret = 1;
2039 close(cp.out);
2041 if (finish_command(&cp)) {
2042 if (flags & SUBMODULE_REMOVAL_DIE_ON_ERROR)
2043 die(_("could not run 'git status' in submodule '%s'"),
2044 path);
2045 ret = -1;
2047 out:
2048 strbuf_release(&buf);
2049 return ret;
2052 void submodule_unset_core_worktree(const struct submodule *sub)
2054 struct strbuf config_path = STRBUF_INIT;
2056 submodule_name_to_gitdir(&config_path, the_repository, sub->name);
2057 strbuf_addstr(&config_path, "/config");
2059 if (git_config_set_in_file_gently(config_path.buf, "core.worktree", NULL))
2060 warning(_("Could not unset core.worktree setting in submodule '%s'"),
2061 sub->path);
2063 strbuf_release(&config_path);
2066 static int submodule_has_dirty_index(const struct submodule *sub)
2068 struct child_process cp = CHILD_PROCESS_INIT;
2070 prepare_submodule_repo_env(&cp.env);
2072 cp.git_cmd = 1;
2073 strvec_pushl(&cp.args, "diff-index", "--quiet",
2074 "--cached", "HEAD", NULL);
2075 cp.no_stdin = 1;
2076 cp.no_stdout = 1;
2077 cp.dir = sub->path;
2078 if (start_command(&cp))
2079 die(_("could not recurse into submodule '%s'"), sub->path);
2081 return finish_command(&cp);
2084 static void submodule_reset_index(const char *path, const char *super_prefix)
2086 struct child_process cp = CHILD_PROCESS_INIT;
2087 prepare_submodule_repo_env(&cp.env);
2089 cp.git_cmd = 1;
2090 cp.no_stdin = 1;
2091 cp.dir = path;
2093 /* TODO: determine if this might overwright untracked files */
2094 strvec_pushl(&cp.args, "read-tree", "-u", "--reset", NULL);
2095 strvec_pushf(&cp.args, "--super-prefix=%s%s/",
2096 (super_prefix ? super_prefix : ""), path);
2098 strvec_push(&cp.args, empty_tree_oid_hex());
2100 if (run_command(&cp))
2101 die(_("could not reset submodule index"));
2105 * Moves a submodule at a given path from a given head to another new head.
2106 * For edge cases (a submodule coming into existence or removing a submodule)
2107 * pass NULL for old or new respectively.
2109 int submodule_move_head(const char *path, const char *super_prefix,
2110 const char *old_head, const char *new_head,
2111 unsigned flags)
2113 int ret = 0;
2114 struct child_process cp = CHILD_PROCESS_INIT;
2115 const struct submodule *sub;
2116 int *error_code_ptr, error_code;
2118 if (!is_submodule_active(the_repository, path))
2119 return 0;
2121 if (flags & SUBMODULE_MOVE_HEAD_FORCE)
2123 * Pass non NULL pointer to is_submodule_populated_gently
2124 * to prevent die()-ing. We'll use connect_work_tree_and_git_dir
2125 * to fixup the submodule in the force case later.
2127 error_code_ptr = &error_code;
2128 else
2129 error_code_ptr = NULL;
2131 if (old_head && !is_submodule_populated_gently(path, error_code_ptr))
2132 return 0;
2134 sub = submodule_from_path(the_repository, null_oid(), path);
2136 if (!sub)
2137 BUG("could not get submodule information for '%s'", path);
2139 if (old_head && !(flags & SUBMODULE_MOVE_HEAD_FORCE)) {
2140 /* Check if the submodule has a dirty index. */
2141 if (submodule_has_dirty_index(sub))
2142 return error(_("submodule '%s' has dirty index"), path);
2145 if (!(flags & SUBMODULE_MOVE_HEAD_DRY_RUN)) {
2146 if (old_head) {
2147 if (!submodule_uses_gitfile(path))
2148 absorb_git_dir_into_superproject(path,
2149 super_prefix);
2150 } else {
2151 struct strbuf gitdir = STRBUF_INIT;
2152 submodule_name_to_gitdir(&gitdir, the_repository,
2153 sub->name);
2154 connect_work_tree_and_git_dir(path, gitdir.buf, 0);
2155 strbuf_release(&gitdir);
2157 /* make sure the index is clean as well */
2158 submodule_reset_index(path, super_prefix);
2161 if (old_head && (flags & SUBMODULE_MOVE_HEAD_FORCE)) {
2162 struct strbuf gitdir = STRBUF_INIT;
2163 submodule_name_to_gitdir(&gitdir, the_repository,
2164 sub->name);
2165 connect_work_tree_and_git_dir(path, gitdir.buf, 1);
2166 strbuf_release(&gitdir);
2170 prepare_submodule_repo_env(&cp.env);
2172 cp.git_cmd = 1;
2173 cp.no_stdin = 1;
2174 cp.dir = path;
2176 strvec_pushl(&cp.args, "read-tree", "--recurse-submodules", NULL);
2177 strvec_pushf(&cp.args, "--super-prefix=%s%s/",
2178 (super_prefix ? super_prefix : ""), path);
2180 if (flags & SUBMODULE_MOVE_HEAD_DRY_RUN)
2181 strvec_push(&cp.args, "-n");
2182 else
2183 strvec_push(&cp.args, "-u");
2185 if (flags & SUBMODULE_MOVE_HEAD_FORCE)
2186 strvec_push(&cp.args, "--reset");
2187 else
2188 strvec_push(&cp.args, "-m");
2190 if (!(flags & SUBMODULE_MOVE_HEAD_FORCE))
2191 strvec_push(&cp.args, old_head ? old_head : empty_tree_oid_hex());
2193 strvec_push(&cp.args, new_head ? new_head : empty_tree_oid_hex());
2195 if (run_command(&cp)) {
2196 ret = error(_("Submodule '%s' could not be updated."), path);
2197 goto out;
2200 if (!(flags & SUBMODULE_MOVE_HEAD_DRY_RUN)) {
2201 if (new_head) {
2202 child_process_init(&cp);
2203 /* also set the HEAD accordingly */
2204 cp.git_cmd = 1;
2205 cp.no_stdin = 1;
2206 cp.dir = path;
2208 prepare_submodule_repo_env(&cp.env);
2209 strvec_pushl(&cp.args, "update-ref", "HEAD",
2210 "--no-deref", new_head, NULL);
2212 if (run_command(&cp)) {
2213 ret = -1;
2214 goto out;
2216 } else {
2217 struct strbuf sb = STRBUF_INIT;
2219 strbuf_addf(&sb, "%s/.git", path);
2220 unlink_or_warn(sb.buf);
2221 strbuf_release(&sb);
2223 if (is_empty_dir(path))
2224 rmdir_or_warn(path);
2226 submodule_unset_core_worktree(sub);
2229 out:
2230 return ret;
2233 int validate_submodule_git_dir(char *git_dir, const char *submodule_name)
2235 size_t len = strlen(git_dir), suffix_len = strlen(submodule_name);
2236 char *p;
2237 int ret = 0;
2239 if (len <= suffix_len || (p = git_dir + len - suffix_len)[-1] != '/' ||
2240 strcmp(p, submodule_name))
2241 BUG("submodule name '%s' not a suffix of git dir '%s'",
2242 submodule_name, git_dir);
2245 * We prevent the contents of sibling submodules' git directories to
2246 * clash.
2248 * Example: having a submodule named `hippo` and another one named
2249 * `hippo/hooks` would result in the git directories
2250 * `.git/modules/hippo/` and `.git/modules/hippo/hooks/`, respectively,
2251 * but the latter directory is already designated to contain the hooks
2252 * of the former.
2254 for (; *p; p++) {
2255 if (is_dir_sep(*p)) {
2256 char c = *p;
2258 *p = '\0';
2259 if (is_git_directory(git_dir))
2260 ret = -1;
2261 *p = c;
2263 if (ret < 0)
2264 return error(_("submodule git dir '%s' is "
2265 "inside git dir '%.*s'"),
2266 git_dir,
2267 (int)(p - git_dir), git_dir);
2271 return 0;
2275 * Embeds a single submodules git directory into the superprojects git dir,
2276 * non recursively.
2278 static void relocate_single_git_dir_into_superproject(const char *path,
2279 const char *super_prefix)
2281 char *old_git_dir = NULL, *real_old_git_dir = NULL, *real_new_git_dir = NULL;
2282 struct strbuf new_gitdir = STRBUF_INIT;
2283 const struct submodule *sub;
2285 if (submodule_uses_worktrees(path))
2286 die(_("relocate_gitdir for submodule '%s' with "
2287 "more than one worktree not supported"), path);
2289 old_git_dir = xstrfmt("%s/.git", path);
2290 if (read_gitfile(old_git_dir))
2291 /* If it is an actual gitfile, it doesn't need migration. */
2292 return;
2294 real_old_git_dir = real_pathdup(old_git_dir, 1);
2296 sub = submodule_from_path(the_repository, null_oid(), path);
2297 if (!sub)
2298 die(_("could not lookup name for submodule '%s'"), path);
2300 submodule_name_to_gitdir(&new_gitdir, the_repository, sub->name);
2301 if (validate_submodule_git_dir(new_gitdir.buf, sub->name) < 0)
2302 die(_("refusing to move '%s' into an existing git dir"),
2303 real_old_git_dir);
2304 if (safe_create_leading_directories_const(new_gitdir.buf) < 0)
2305 die(_("could not create directory '%s'"), new_gitdir.buf);
2306 real_new_git_dir = real_pathdup(new_gitdir.buf, 1);
2308 fprintf(stderr, _("Migrating git directory of '%s%s' from\n'%s' to\n'%s'\n"),
2309 super_prefix ? super_prefix : "", path,
2310 real_old_git_dir, real_new_git_dir);
2312 relocate_gitdir(path, real_old_git_dir, real_new_git_dir);
2314 free(old_git_dir);
2315 free(real_old_git_dir);
2316 free(real_new_git_dir);
2317 strbuf_release(&new_gitdir);
2320 static void absorb_git_dir_into_superproject_recurse(const char *path,
2321 const char *super_prefix)
2324 struct child_process cp = CHILD_PROCESS_INIT;
2326 cp.dir = path;
2327 cp.git_cmd = 1;
2328 cp.no_stdin = 1;
2329 strvec_pushl(&cp.args, "submodule--helper",
2330 "absorbgitdirs", NULL);
2331 strvec_pushf(&cp.args, "--super-prefix=%s%s/", super_prefix ?
2332 super_prefix : "", path);
2334 prepare_submodule_repo_env(&cp.env);
2335 if (run_command(&cp))
2336 die(_("could not recurse into submodule '%s'"), path);
2340 * Migrate the git directory of the submodule given by path from
2341 * having its git directory within the working tree to the git dir nested
2342 * in its superprojects git dir under modules/.
2344 void absorb_git_dir_into_superproject(const char *path,
2345 const char *super_prefix)
2347 int err_code;
2348 const char *sub_git_dir;
2349 struct strbuf gitdir = STRBUF_INIT;
2350 strbuf_addf(&gitdir, "%s/.git", path);
2351 sub_git_dir = resolve_gitdir_gently(gitdir.buf, &err_code);
2353 /* Not populated? */
2354 if (!sub_git_dir) {
2355 const struct submodule *sub;
2356 struct strbuf sub_gitdir = STRBUF_INIT;
2358 if (err_code == READ_GITFILE_ERR_STAT_FAILED) {
2359 /* unpopulated as expected */
2360 strbuf_release(&gitdir);
2361 return;
2364 if (err_code != READ_GITFILE_ERR_NOT_A_REPO)
2365 /* We don't know what broke here. */
2366 read_gitfile_error_die(err_code, path, NULL);
2369 * Maybe populated, but no git directory was found?
2370 * This can happen if the superproject is a submodule
2371 * itself and was just absorbed. The absorption of the
2372 * superproject did not rewrite the git file links yet,
2373 * fix it now.
2375 sub = submodule_from_path(the_repository, null_oid(), path);
2376 if (!sub)
2377 die(_("could not lookup name for submodule '%s'"), path);
2378 submodule_name_to_gitdir(&sub_gitdir, the_repository, sub->name);
2379 connect_work_tree_and_git_dir(path, sub_gitdir.buf, 0);
2380 strbuf_release(&sub_gitdir);
2381 } else {
2382 /* Is it already absorbed into the superprojects git dir? */
2383 char *real_sub_git_dir = real_pathdup(sub_git_dir, 1);
2384 char *real_common_git_dir = real_pathdup(get_git_common_dir(), 1);
2386 if (!starts_with(real_sub_git_dir, real_common_git_dir))
2387 relocate_single_git_dir_into_superproject(path, super_prefix);
2389 free(real_sub_git_dir);
2390 free(real_common_git_dir);
2392 strbuf_release(&gitdir);
2394 absorb_git_dir_into_superproject_recurse(path, super_prefix);
2397 int get_superproject_working_tree(struct strbuf *buf)
2399 struct child_process cp = CHILD_PROCESS_INIT;
2400 struct strbuf sb = STRBUF_INIT;
2401 struct strbuf one_up = STRBUF_INIT;
2402 char *cwd = xgetcwd();
2403 int ret = 0;
2404 const char *subpath;
2405 int code;
2406 ssize_t len;
2408 if (!is_inside_work_tree())
2410 * FIXME:
2411 * We might have a superproject, but it is harder
2412 * to determine.
2414 return 0;
2416 if (!strbuf_realpath(&one_up, "../", 0))
2417 return 0;
2419 subpath = relative_path(cwd, one_up.buf, &sb);
2420 strbuf_release(&one_up);
2422 prepare_submodule_repo_env(&cp.env);
2423 strvec_pop(&cp.env);
2425 strvec_pushl(&cp.args, "--literal-pathspecs", "-C", "..",
2426 "ls-files", "-z", "--stage", "--full-name", "--",
2427 subpath, NULL);
2428 strbuf_reset(&sb);
2430 cp.no_stdin = 1;
2431 cp.no_stderr = 1;
2432 cp.out = -1;
2433 cp.git_cmd = 1;
2435 if (start_command(&cp))
2436 die(_("could not start ls-files in .."));
2438 len = strbuf_read(&sb, cp.out, PATH_MAX);
2439 close(cp.out);
2441 if (starts_with(sb.buf, "160000")) {
2442 int super_sub_len;
2443 int cwd_len = strlen(cwd);
2444 char *super_sub, *super_wt;
2447 * There is a superproject having this repo as a submodule.
2448 * The format is <mode> SP <hash> SP <stage> TAB <full name> \0,
2449 * We're only interested in the name after the tab.
2451 super_sub = strchr(sb.buf, '\t') + 1;
2452 super_sub_len = strlen(super_sub);
2454 if (super_sub_len > cwd_len ||
2455 strcmp(&cwd[cwd_len - super_sub_len], super_sub))
2456 BUG("returned path string doesn't match cwd?");
2458 super_wt = xstrdup(cwd);
2459 super_wt[cwd_len - super_sub_len] = '\0';
2461 strbuf_realpath(buf, super_wt, 1);
2462 ret = 1;
2463 free(super_wt);
2465 free(cwd);
2466 strbuf_release(&sb);
2468 code = finish_command(&cp);
2470 if (code == 128)
2471 /* '../' is not a git repository */
2472 return 0;
2473 if (code == 0 && len == 0)
2474 /* There is an unrelated git repository at '../' */
2475 return 0;
2476 if (code)
2477 die(_("ls-tree returned unexpected return code %d"), code);
2479 return ret;
2483 * Put the gitdir for a submodule (given relative to the main
2484 * repository worktree) into `buf`, or return -1 on error.
2486 int submodule_to_gitdir(struct strbuf *buf, const char *submodule)
2488 const struct submodule *sub;
2489 const char *git_dir;
2490 int ret = 0;
2492 strbuf_reset(buf);
2493 strbuf_addstr(buf, submodule);
2494 strbuf_complete(buf, '/');
2495 strbuf_addstr(buf, ".git");
2497 git_dir = read_gitfile(buf->buf);
2498 if (git_dir) {
2499 strbuf_reset(buf);
2500 strbuf_addstr(buf, git_dir);
2502 if (!is_git_directory(buf->buf)) {
2503 sub = submodule_from_path(the_repository, null_oid(),
2504 submodule);
2505 if (!sub) {
2506 ret = -1;
2507 goto cleanup;
2509 strbuf_reset(buf);
2510 submodule_name_to_gitdir(buf, the_repository, sub->name);
2513 cleanup:
2514 return ret;
2517 void submodule_name_to_gitdir(struct strbuf *buf, struct repository *r,
2518 const char *submodule_name)
2521 * NEEDSWORK: The current way of mapping a submodule's name to
2522 * its location in .git/modules/ has problems with some naming
2523 * schemes. For example, if a submodule is named "foo" and
2524 * another is named "foo/bar" (whether present in the same
2525 * superproject commit or not - the problem will arise if both
2526 * superproject commits have been checked out at any point in
2527 * time), or if two submodule names only have different cases in
2528 * a case-insensitive filesystem.
2530 * There are several solutions, including encoding the path in
2531 * some way, introducing a submodule.<name>.gitdir config in
2532 * .git/config (not .gitmodules) that allows overriding what the
2533 * gitdir of a submodule would be (and teach Git, upon noticing
2534 * a clash, to automatically determine a non-clashing name and
2535 * to write such a config), or introducing a
2536 * submodule.<name>.gitdir config in .gitmodules that repo
2537 * administrators can explicitly set. Nothing has been decided,
2538 * so for now, just append the name at the end of the path.
2540 strbuf_repo_git_path(buf, r, "modules/");
2541 strbuf_addstr(buf, submodule_name);