3 #include "repository.h"
5 #include "submodule-config.h"
11 #include "run-command.h"
14 #include "string-list.h"
15 #include "oid-array.h"
18 #include "thread-utils.h"
22 #include "parse-options.h"
23 #include "object-store.h"
24 #include "commit-reach.h"
26 static int config_update_recurse_submodules
= RECURSE_SUBMODULES_OFF
;
27 static int initialized_fetch_ref_tips
;
28 static struct oid_array ref_tips_before_fetch
;
29 static struct oid_array ref_tips_after_fetch
;
32 * Check if the .gitmodules file is unmerged. Parsing of the .gitmodules file
33 * will be disabled because we can't guess what might be configured in
34 * .gitmodules unless the user resolves the conflict.
36 int is_gitmodules_unmerged(struct index_state
*istate
)
38 int pos
= index_name_pos(istate
, GITMODULES_FILE
, strlen(GITMODULES_FILE
));
39 if (pos
< 0) { /* .gitmodules not found or isn't merged */
41 if (istate
->cache_nr
> pos
) { /* there is a .gitmodules */
42 const struct cache_entry
*ce
= istate
->cache
[pos
];
43 if (ce_namelen(ce
) == strlen(GITMODULES_FILE
) &&
44 !strcmp(ce
->name
, GITMODULES_FILE
))
53 * Check if the .gitmodules file is safe to write.
55 * Writing to the .gitmodules file requires that the file exists in the
56 * working tree or, if it doesn't, that a brand new .gitmodules file is going
57 * to be created (i.e. it's neither in the index nor in the current branch).
59 * It is not safe to write to .gitmodules if it's not in the working tree but
60 * it is in the index or in the current branch, because writing new values
61 * (and staging them) would blindly overwrite ALL the old content.
63 int is_writing_gitmodules_ok(void)
66 return file_exists(GITMODULES_FILE
) ||
67 (get_oid(GITMODULES_INDEX
, &oid
) < 0 && get_oid(GITMODULES_HEAD
, &oid
) < 0);
71 * Check if the .gitmodules file has unstaged modifications. This must be
72 * checked before allowing modifications to the .gitmodules file with the
73 * intention to stage them later, because when continuing we would stage the
74 * modifications the user didn't stage herself too. That might change in a
75 * future version when we learn to stage the changes we do ourselves without
76 * staging any previous modifications.
78 int is_staging_gitmodules_ok(struct index_state
*istate
)
80 int pos
= index_name_pos(istate
, GITMODULES_FILE
, strlen(GITMODULES_FILE
));
82 if ((pos
>= 0) && (pos
< istate
->cache_nr
)) {
84 if (lstat(GITMODULES_FILE
, &st
) == 0 &&
85 ie_modified(istate
, istate
->cache
[pos
], &st
, 0) & DATA_CHANGED
)
92 static int for_each_remote_ref_submodule(const char *submodule
,
93 each_ref_fn fn
, void *cb_data
)
95 return refs_for_each_remote_ref(get_submodule_ref_store(submodule
),
100 * Try to update the "path" entry in the "submodule.<name>" section of the
101 * .gitmodules file. Return 0 only if a .gitmodules file was found, a section
102 * with the correct path=<oldpath> setting was found and we could update it.
104 int update_path_in_gitmodules(const char *oldpath
, const char *newpath
)
106 struct strbuf entry
= STRBUF_INIT
;
107 const struct submodule
*submodule
;
110 if (!file_exists(GITMODULES_FILE
)) /* Do nothing without .gitmodules */
113 if (is_gitmodules_unmerged(the_repository
->index
))
114 die(_("Cannot change unmerged .gitmodules, resolve merge conflicts first"));
116 submodule
= submodule_from_path(the_repository
, null_oid(), oldpath
);
117 if (!submodule
|| !submodule
->name
) {
118 warning(_("Could not find section in .gitmodules where path=%s"), oldpath
);
121 strbuf_addstr(&entry
, "submodule.");
122 strbuf_addstr(&entry
, submodule
->name
);
123 strbuf_addstr(&entry
, ".path");
124 ret
= config_set_in_gitmodules_file_gently(entry
.buf
, newpath
);
125 strbuf_release(&entry
);
130 * Try to remove the "submodule.<name>" section from .gitmodules where the given
131 * path is configured. Return 0 only if a .gitmodules file was found, a section
132 * with the correct path=<path> setting was found and we could remove it.
134 int remove_path_from_gitmodules(const char *path
)
136 struct strbuf sect
= STRBUF_INIT
;
137 const struct submodule
*submodule
;
139 if (!file_exists(GITMODULES_FILE
)) /* Do nothing without .gitmodules */
142 if (is_gitmodules_unmerged(the_repository
->index
))
143 die(_("Cannot change unmerged .gitmodules, resolve merge conflicts first"));
145 submodule
= submodule_from_path(the_repository
, null_oid(), path
);
146 if (!submodule
|| !submodule
->name
) {
147 warning(_("Could not find section in .gitmodules where path=%s"), path
);
150 strbuf_addstr(§
, "submodule.");
151 strbuf_addstr(§
, submodule
->name
);
152 if (git_config_rename_section_in_file(GITMODULES_FILE
, sect
.buf
, NULL
) < 0) {
153 /* Maybe the user already did that, don't error out here */
154 warning(_("Could not remove .gitmodules entry for %s"), path
);
155 strbuf_release(§
);
158 strbuf_release(§
);
162 void stage_updated_gitmodules(struct index_state
*istate
)
164 if (add_file_to_index(istate
, GITMODULES_FILE
, 0))
165 die(_("staging updated .gitmodules failed"));
168 static struct string_list added_submodule_odb_paths
= STRING_LIST_INIT_NODUP
;
170 /* TODO: remove this function, use repo_submodule_init instead. */
171 int add_submodule_odb(const char *path
)
173 struct strbuf objects_directory
= STRBUF_INIT
;
176 ret
= strbuf_git_path_submodule(&objects_directory
, path
, "objects/");
179 if (!is_directory(objects_directory
.buf
)) {
183 string_list_insert(&added_submodule_odb_paths
,
184 strbuf_detach(&objects_directory
, NULL
));
186 strbuf_release(&objects_directory
);
190 void add_submodule_odb_by_path(const char *path
)
192 string_list_insert(&added_submodule_odb_paths
, xstrdup(path
));
195 int register_all_submodule_odb_as_alternates(void)
198 int ret
= added_submodule_odb_paths
.nr
;
200 for (i
= 0; i
< added_submodule_odb_paths
.nr
; i
++)
201 add_to_alternates_memory(added_submodule_odb_paths
.items
[i
].string
);
203 string_list_clear(&added_submodule_odb_paths
, 0);
204 if (git_env_bool("GIT_TEST_FATAL_REGISTER_SUBMODULE_ODB", 0))
205 BUG("register_all_submodule_odb_as_alternates() called");
210 void set_diffopt_flags_from_submodule_config(struct diff_options
*diffopt
,
213 const struct submodule
*submodule
= submodule_from_path(the_repository
,
220 key
= xstrfmt("submodule.%s.ignore", submodule
->name
);
221 if (repo_config_get_string_tmp(the_repository
, key
, &ignore
))
222 ignore
= submodule
->ignore
;
226 handle_ignore_submodules_arg(diffopt
, ignore
);
227 else if (is_gitmodules_unmerged(the_repository
->index
))
228 diffopt
->flags
.ignore_submodules
= 1;
232 /* Cheap function that only determines if we're interested in submodules at all */
233 int git_default_submodule_config(const char *var
, const char *value
, void *cb
)
235 if (!strcmp(var
, "submodule.recurse")) {
236 int v
= git_config_bool(var
, value
) ?
237 RECURSE_SUBMODULES_ON
: RECURSE_SUBMODULES_OFF
;
238 config_update_recurse_submodules
= v
;
243 int option_parse_recurse_submodules_worktree_updater(const struct option
*opt
,
244 const char *arg
, int unset
)
247 config_update_recurse_submodules
= RECURSE_SUBMODULES_OFF
;
251 config_update_recurse_submodules
=
252 parse_update_recurse_submodules_arg(opt
->long_name
,
255 config_update_recurse_submodules
= RECURSE_SUBMODULES_ON
;
261 * Determine if a submodule has been initialized at a given 'path'
264 * NEEDSWORK: Emit a warning if submodule.active exists, but is valueless,
265 * ie, the config looks like: "[submodule] active\n".
266 * Since that is an invalid pathspec, we should inform the user.
268 int is_submodule_active(struct repository
*repo
, const char *path
)
273 const struct string_list
*sl
;
274 const struct submodule
*module
;
276 module
= submodule_from_path(repo
, null_oid(), path
);
278 /* early return if there isn't a path->module mapping */
282 /* submodule.<name>.active is set */
283 key
= xstrfmt("submodule.%s.active", module
->name
);
284 if (!repo_config_get_bool(repo
, key
, &ret
)) {
290 /* submodule.active is set */
291 sl
= repo_config_get_value_multi(repo
, "submodule.active");
294 struct strvec args
= STRVEC_INIT
;
295 const struct string_list_item
*item
;
297 for_each_string_list_item(item
, sl
) {
298 strvec_push(&args
, item
->string
);
301 parse_pathspec(&ps
, 0, 0, NULL
, args
.v
);
302 ret
= match_pathspec(repo
->index
, &ps
, path
, strlen(path
), 0, NULL
, 1);
309 /* fallback to checking if the URL is set */
310 key
= xstrfmt("submodule.%s.url", module
->name
);
311 ret
= !repo_config_get_string(repo
, key
, &value
);
318 int is_submodule_populated_gently(const char *path
, int *return_error_code
)
321 char *gitdir
= xstrfmt("%s/.git", path
);
323 if (resolve_gitdir_gently(gitdir
, return_error_code
))
331 * Dies if the provided 'prefix' corresponds to an unpopulated submodule
333 void die_in_unpopulated_submodule(struct index_state
*istate
,
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
))
349 if (prefixlen
<= ce_len
)
351 if (strncmp(ce
->name
, prefix
, ce_len
))
353 if (prefix
[ce_len
] != '/')
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
)
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
))
375 for (j
= 0; j
< ps
->nr
; j
++) {
376 const struct pathspec_item
*item
= &ps
->items
[j
];
378 if (item
->len
<= ce_len
)
380 if (item
->match
[ce_len
] != '/')
382 if (strncmp(ce
->name
, item
->match
, ce_len
))
384 if (item
->len
== ce_len
+ 1)
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
;
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
);
417 type
= parse_submodule_update_type(value
);
418 if (type
== SM_UPDATE_UNSPECIFIED
)
422 if (type
== SM_UPDATE_COMMAND
)
423 dst
->command
= xstrdup(value
+ 1);
428 const char *submodule_strategy_to_string(const struct submodule_update_strategy
*s
)
430 struct strbuf sb
= STRBUF_INIT
;
432 case SM_UPDATE_CHECKOUT
:
434 case SM_UPDATE_MERGE
:
436 case SM_UPDATE_REBASE
:
440 case SM_UPDATE_UNSPECIFIED
:
442 case SM_UPDATE_COMMAND
:
443 strbuf_addf(&sb
, "!%s", s
->command
);
444 return strbuf_detach(&sb
, NULL
);
449 void handle_ignore_submodules_arg(struct diff_options
*diffopt
,
452 diffopt
->flags
.ignore_submodule_set
= 1;
453 diffopt
->flags
.ignore_submodules
= 0;
454 diffopt
->flags
.ignore_untracked_in_submodules
= 0;
455 diffopt
->flags
.ignore_dirty_submodules
= 0;
457 if (!strcmp(arg
, "all"))
458 diffopt
->flags
.ignore_submodules
= 1;
459 else if (!strcmp(arg
, "untracked"))
460 diffopt
->flags
.ignore_untracked_in_submodules
= 1;
461 else if (!strcmp(arg
, "dirty"))
462 diffopt
->flags
.ignore_dirty_submodules
= 1;
463 else if (strcmp(arg
, "none"))
464 die(_("bad --ignore-submodules argument: %s"), arg
);
466 * Please update _git_status() in git-completion.bash when you
471 static int prepare_submodule_diff_summary(struct repository
*r
, struct rev_info
*rev
,
473 struct commit
*left
, struct commit
*right
,
474 struct commit_list
*merge_bases
)
476 struct commit_list
*list
;
478 repo_init_revisions(r
, rev
, NULL
);
479 setup_revisions(0, NULL
, rev
, NULL
);
481 rev
->first_parent_only
= 1;
482 left
->object
.flags
|= SYMMETRIC_LEFT
;
483 add_pending_object(rev
, &left
->object
, path
);
484 add_pending_object(rev
, &right
->object
, path
);
485 for (list
= merge_bases
; list
; list
= list
->next
) {
486 list
->item
->object
.flags
|= UNINTERESTING
;
487 add_pending_object(rev
, &list
->item
->object
,
488 oid_to_hex(&list
->item
->object
.oid
));
490 return prepare_revision_walk(rev
);
493 static void print_submodule_diff_summary(struct repository
*r
, struct rev_info
*rev
, struct diff_options
*o
)
495 static const char format
[] = " %m %s";
496 struct strbuf sb
= STRBUF_INIT
;
497 struct commit
*commit
;
499 while ((commit
= get_revision(rev
))) {
500 struct pretty_print_context ctx
= {0};
501 ctx
.date_mode
= rev
->date_mode
;
502 ctx
.output_encoding
= get_log_output_encoding();
503 strbuf_setlen(&sb
, 0);
504 repo_format_commit_message(r
, commit
, format
, &sb
,
506 strbuf_addch(&sb
, '\n');
507 if (commit
->object
.flags
& SYMMETRIC_LEFT
)
508 diff_emit_submodule_del(o
, sb
.buf
);
510 diff_emit_submodule_add(o
, sb
.buf
);
515 void prepare_submodule_repo_env(struct strvec
*out
)
517 prepare_other_repo_env(out
, DEFAULT_GIT_DIR_ENVIRONMENT
);
520 static void prepare_submodule_repo_env_in_gitdir(struct strvec
*out
)
522 prepare_other_repo_env(out
, ".");
526 * Initialize a repository struct for a submodule based on the provided 'path'.
528 * Unlike repo_submodule_init, this tolerates submodules not present
529 * in .gitmodules. This function exists only to preserve historical behavior,
531 * Returns the repository struct on success,
532 * NULL when the submodule is not present.
534 static struct repository
*open_submodule(const char *path
)
536 struct strbuf sb
= STRBUF_INIT
;
537 struct repository
*out
= xmalloc(sizeof(*out
));
539 if (submodule_to_gitdir(&sb
, path
) || repo_init(out
, sb
.buf
, NULL
)) {
545 /* Mark it as a submodule */
546 out
->submodule_prefix
= xstrdup(path
);
553 * Helper function to display the submodule header line prior to the full
556 * If it can locate the submodule git directory it will create a repository
557 * handle for the submodule and lookup both the left and right commits and
558 * put them into the left and right pointers.
560 static void show_submodule_header(struct diff_options
*o
,
562 struct object_id
*one
, struct object_id
*two
,
563 unsigned dirty_submodule
,
564 struct repository
*sub
,
565 struct commit
**left
, struct commit
**right
,
566 struct commit_list
**merge_bases
)
568 const char *message
= NULL
;
569 struct strbuf sb
= STRBUF_INIT
;
570 int fast_forward
= 0, fast_backward
= 0;
572 if (dirty_submodule
& DIRTY_SUBMODULE_UNTRACKED
)
573 diff_emit_submodule_untracked(o
, path
);
575 if (dirty_submodule
& DIRTY_SUBMODULE_MODIFIED
)
576 diff_emit_submodule_modified(o
, path
);
578 if (is_null_oid(one
))
579 message
= "(new submodule)";
580 else if (is_null_oid(two
))
581 message
= "(submodule deleted)";
585 message
= "(commits not present)";
590 * Attempt to lookup the commit references, and determine if this is
591 * a fast forward or fast backwards update.
593 *left
= lookup_commit_reference(sub
, one
);
594 *right
= lookup_commit_reference(sub
, two
);
597 * Warn about missing commits in the submodule project, but only if
600 if ((!is_null_oid(one
) && !*left
) ||
601 (!is_null_oid(two
) && !*right
))
602 message
= "(commits not present)";
604 *merge_bases
= repo_get_merge_bases(sub
, *left
, *right
);
606 if ((*merge_bases
)->item
== *left
)
608 else if ((*merge_bases
)->item
== *right
)
612 if (oideq(one
, two
)) {
618 strbuf_addf(&sb
, "Submodule %s ", path
);
619 strbuf_add_unique_abbrev(&sb
, one
, DEFAULT_ABBREV
);
620 strbuf_addstr(&sb
, (fast_backward
|| fast_forward
) ? ".." : "...");
621 strbuf_add_unique_abbrev(&sb
, two
, DEFAULT_ABBREV
);
623 strbuf_addf(&sb
, " %s\n", message
);
625 strbuf_addf(&sb
, "%s:\n", fast_backward
? " (rewind)" : "");
626 diff_emit_submodule_header(o
, sb
.buf
);
631 void show_submodule_diff_summary(struct diff_options
*o
, const char *path
,
632 struct object_id
*one
, struct object_id
*two
,
633 unsigned dirty_submodule
)
636 struct commit
*left
= NULL
, *right
= NULL
;
637 struct commit_list
*merge_bases
= NULL
;
638 struct repository
*sub
;
640 sub
= open_submodule(path
);
641 show_submodule_header(o
, path
, one
, two
, dirty_submodule
,
642 sub
, &left
, &right
, &merge_bases
);
645 * If we don't have both a left and a right pointer, there is no
646 * reason to try and display a summary. The header line should contain
647 * all the information the user needs.
649 if (!left
|| !right
|| !sub
)
652 /* Treat revision walker failure the same as missing commits */
653 if (prepare_submodule_diff_summary(sub
, &rev
, path
, left
, right
, merge_bases
)) {
654 diff_emit_submodule_error(o
, "(revision walker failed)\n");
658 print_submodule_diff_summary(sub
, &rev
, o
);
662 free_commit_list(merge_bases
);
663 clear_commit_marks(left
, ~0);
664 clear_commit_marks(right
, ~0);
671 void show_submodule_inline_diff(struct diff_options
*o
, const char *path
,
672 struct object_id
*one
, struct object_id
*two
,
673 unsigned dirty_submodule
)
675 const struct object_id
*old_oid
= the_hash_algo
->empty_tree
, *new_oid
= the_hash_algo
->empty_tree
;
676 struct commit
*left
= NULL
, *right
= NULL
;
677 struct commit_list
*merge_bases
= NULL
;
678 struct child_process cp
= CHILD_PROCESS_INIT
;
679 struct strbuf sb
= STRBUF_INIT
;
680 struct repository
*sub
;
682 sub
= open_submodule(path
);
683 show_submodule_header(o
, path
, one
, two
, dirty_submodule
,
684 sub
, &left
, &right
, &merge_bases
);
686 /* We need a valid left and right commit to display a difference */
687 if (!(left
|| is_null_oid(one
)) ||
688 !(right
|| is_null_oid(two
)))
701 /* TODO: other options may need to be passed here. */
702 strvec_pushl(&cp
.args
, "diff", "--submodule=diff", NULL
);
703 strvec_pushf(&cp
.args
, "--color=%s", want_color(o
->use_color
) ?
706 if (o
->flags
.reverse_diff
) {
707 strvec_pushf(&cp
.args
, "--src-prefix=%s%s/",
709 strvec_pushf(&cp
.args
, "--dst-prefix=%s%s/",
712 strvec_pushf(&cp
.args
, "--src-prefix=%s%s/",
714 strvec_pushf(&cp
.args
, "--dst-prefix=%s%s/",
717 strvec_push(&cp
.args
, oid_to_hex(old_oid
));
719 * If the submodule has modified content, we will diff against the
720 * work tree, under the assumption that the user has asked for the
721 * diff format and wishes to actually see all differences even if they
722 * haven't yet been committed to the submodule yet.
724 if (!(dirty_submodule
& DIRTY_SUBMODULE_MODIFIED
))
725 strvec_push(&cp
.args
, oid_to_hex(new_oid
));
727 prepare_submodule_repo_env(&cp
.env_array
);
729 if (!is_directory(path
)) {
730 /* fall back to absorbed git dir, if any */
733 cp
.dir
= sub
->gitdir
;
734 strvec_push(&cp
.env_array
, GIT_DIR_ENVIRONMENT
"=.");
735 strvec_push(&cp
.env_array
, GIT_WORK_TREE_ENVIRONMENT
"=.");
738 if (start_command(&cp
)) {
739 diff_emit_submodule_error(o
, "(diff failed)\n");
743 while (strbuf_getwholeline_fd(&sb
, cp
.out
, '\n') != EOF
)
744 diff_emit_submodule_pipethrough(o
, sb
.buf
, sb
.len
);
746 if (finish_command(&cp
))
747 diff_emit_submodule_error(o
, "(diff failed)\n");
752 free_commit_list(merge_bases
);
754 clear_commit_marks(left
, ~0);
756 clear_commit_marks(right
, ~0);
763 int should_update_submodules(void)
765 return config_update_recurse_submodules
== RECURSE_SUBMODULES_ON
;
768 const struct submodule
*submodule_from_ce(const struct cache_entry
*ce
)
770 if (!S_ISGITLINK(ce
->ce_mode
))
773 if (!should_update_submodules())
776 return submodule_from_path(the_repository
, null_oid(), ce
->name
);
779 static struct oid_array
*submodule_commits(struct string_list
*submodules
,
782 struct string_list_item
*item
;
784 item
= string_list_insert(submodules
, name
);
786 return (struct oid_array
*) item
->util
;
788 /* NEEDSWORK: should we have oid_array_init()? */
789 item
->util
= xcalloc(1, sizeof(struct oid_array
));
790 return (struct oid_array
*) item
->util
;
793 struct collect_changed_submodules_cb_data
{
794 struct repository
*repo
;
795 struct string_list
*changed
;
796 const struct object_id
*commit_oid
;
800 * this would normally be two functions: default_name_from_path() and
801 * path_from_default_name(). Since the default name is the same as
802 * the submodule path we can get away with just one function which only
803 * checks whether there is a submodule in the working directory at that
806 static const char *default_name_or_path(const char *path_or_name
)
810 if (!is_submodule_populated_gently(path_or_name
, &error_code
))
816 static void collect_changed_submodules_cb(struct diff_queue_struct
*q
,
817 struct diff_options
*options
,
820 struct collect_changed_submodules_cb_data
*me
= data
;
821 struct string_list
*changed
= me
->changed
;
822 const struct object_id
*commit_oid
= me
->commit_oid
;
825 for (i
= 0; i
< q
->nr
; i
++) {
826 struct diff_filepair
*p
= q
->queue
[i
];
827 struct oid_array
*commits
;
828 const struct submodule
*submodule
;
831 if (!S_ISGITLINK(p
->two
->mode
))
834 submodule
= submodule_from_path(me
->repo
,
835 commit_oid
, p
->two
->path
);
837 name
= submodule
->name
;
839 name
= default_name_or_path(p
->two
->path
);
840 /* make sure name does not collide with existing one */
842 submodule
= submodule_from_name(me
->repo
,
845 warning(_("Submodule in commit %s at path: "
846 "'%s' collides with a submodule named "
847 "the same. Skipping it."),
848 oid_to_hex(commit_oid
), p
->two
->path
);
856 commits
= submodule_commits(changed
, name
);
857 oid_array_append(commits
, &p
->two
->oid
);
862 * Collect the paths of submodules in 'changed' which have changed based on
863 * the revisions as specified in 'argv'. Each entry in 'changed' will also
864 * have a corresponding 'struct oid_array' (in the 'util' field) which lists
865 * what the submodule pointers were updated to during the change.
867 static void collect_changed_submodules(struct repository
*r
,
868 struct string_list
*changed
,
872 const struct commit
*commit
;
874 struct setup_revision_opt s_r_opt
= {
875 .assume_dashdash
= 1,
878 save_warning
= warn_on_object_refname_ambiguity
;
879 warn_on_object_refname_ambiguity
= 0;
880 repo_init_revisions(r
, &rev
, NULL
);
881 setup_revisions(argv
->nr
, argv
->v
, &rev
, &s_r_opt
);
882 warn_on_object_refname_ambiguity
= save_warning
;
883 if (prepare_revision_walk(&rev
))
884 die(_("revision walk setup failed"));
886 while ((commit
= get_revision(&rev
))) {
887 struct rev_info diff_rev
;
888 struct collect_changed_submodules_cb_data data
;
890 data
.changed
= changed
;
891 data
.commit_oid
= &commit
->object
.oid
;
893 repo_init_revisions(r
, &diff_rev
, NULL
);
894 diff_rev
.diffopt
.output_format
|= DIFF_FORMAT_CALLBACK
;
895 diff_rev
.diffopt
.format_callback
= collect_changed_submodules_cb
;
896 diff_rev
.diffopt
.format_callback_data
= &data
;
897 diff_rev
.dense_combined_merges
= 1;
898 diff_tree_combined_merge(commit
, &diff_rev
);
901 reset_revision_walk();
904 static void free_submodules_oids(struct string_list
*submodules
)
906 struct string_list_item
*item
;
907 for_each_string_list_item(item
, submodules
)
908 oid_array_clear((struct oid_array
*) item
->util
);
909 string_list_clear(submodules
, 1);
912 static int has_remote(const char *refname
, const struct object_id
*oid
,
913 int flags
, void *cb_data
)
918 static int append_oid_to_argv(const struct object_id
*oid
, void *data
)
920 struct strvec
*argv
= data
;
921 strvec_push(argv
, oid_to_hex(oid
));
925 struct has_commit_data
{
926 struct repository
*repo
;
931 static int check_has_commit(const struct object_id
*oid
, void *data
)
933 struct has_commit_data
*cb
= data
;
935 enum object_type type
= oid_object_info(cb
->repo
, oid
, NULL
);
942 * Object is missing or invalid. If invalid, an error message
943 * has already been printed.
948 die(_("submodule entry '%s' (%s) is a %s, not a commit"),
949 cb
->path
, oid_to_hex(oid
), type_name(type
));
953 static int submodule_has_commits(struct repository
*r
,
955 struct oid_array
*commits
)
957 struct has_commit_data has_commit
= { r
, 1, path
};
960 * Perform a cheap, but incorrect check for the existence of 'commits'.
961 * This is done by adding the submodule's object store to the in-core
962 * object store, and then querying for each commit's existence. If we
963 * do not have the commit object anywhere, there is no chance we have
964 * it in the object store of the correct submodule and have it
965 * reachable from a ref, so we can fail early without spawning rev-list
966 * which is expensive.
968 if (add_submodule_odb(path
))
971 oid_array_for_each_unique(commits
, check_has_commit
, &has_commit
);
973 if (has_commit
.result
) {
975 * Even if the submodule is checked out and the commit is
976 * present, make sure it exists in the submodule's object store
977 * and that it is reachable from a ref.
979 struct child_process cp
= CHILD_PROCESS_INIT
;
980 struct strbuf out
= STRBUF_INIT
;
982 strvec_pushl(&cp
.args
, "rev-list", "-n", "1", NULL
);
983 oid_array_for_each_unique(commits
, append_oid_to_argv
, &cp
.args
);
984 strvec_pushl(&cp
.args
, "--not", "--all", NULL
);
986 prepare_submodule_repo_env(&cp
.env_array
);
991 if (capture_command(&cp
, &out
, GIT_MAX_HEXSZ
+ 1) || out
.len
)
992 has_commit
.result
= 0;
994 strbuf_release(&out
);
997 return has_commit
.result
;
1000 static int submodule_needs_pushing(struct repository
*r
,
1002 struct oid_array
*commits
)
1004 if (!submodule_has_commits(r
, path
, commits
))
1006 * NOTE: We do consider it safe to return "no" here. The
1007 * correct answer would be "We do not know" instead of
1008 * "No push needed", but it is quite hard to change
1009 * the submodule pointer without having the submodule
1010 * around. If a user did however change the submodules
1011 * without having the submodule around, this indicates
1012 * an expert who knows what they are doing or a
1013 * maintainer integrating work from other people. In
1014 * both cases it should be safe to skip this check.
1018 if (for_each_remote_ref_submodule(path
, has_remote
, NULL
) > 0) {
1019 struct child_process cp
= CHILD_PROCESS_INIT
;
1020 struct strbuf buf
= STRBUF_INIT
;
1021 int needs_pushing
= 0;
1023 strvec_push(&cp
.args
, "rev-list");
1024 oid_array_for_each_unique(commits
, append_oid_to_argv
, &cp
.args
);
1025 strvec_pushl(&cp
.args
, "--not", "--remotes", "-n", "1" , NULL
);
1027 prepare_submodule_repo_env(&cp
.env_array
);
1032 if (start_command(&cp
))
1033 die(_("Could not run 'git rev-list <commits> --not --remotes -n 1' command in submodule %s"),
1035 if (strbuf_read(&buf
, cp
.out
, the_hash_algo
->hexsz
+ 1))
1037 finish_command(&cp
);
1039 strbuf_release(&buf
);
1040 return needs_pushing
;
1046 int find_unpushed_submodules(struct repository
*r
,
1047 struct oid_array
*commits
,
1048 const char *remotes_name
,
1049 struct string_list
*needs_pushing
)
1051 struct string_list submodules
= STRING_LIST_INIT_DUP
;
1052 struct string_list_item
*name
;
1053 struct strvec argv
= STRVEC_INIT
;
1055 /* argv.v[0] will be ignored by setup_revisions */
1056 strvec_push(&argv
, "find_unpushed_submodules");
1057 oid_array_for_each_unique(commits
, append_oid_to_argv
, &argv
);
1058 strvec_push(&argv
, "--not");
1059 strvec_pushf(&argv
, "--remotes=%s", remotes_name
);
1061 collect_changed_submodules(r
, &submodules
, &argv
);
1063 for_each_string_list_item(name
, &submodules
) {
1064 struct oid_array
*commits
= name
->util
;
1065 const struct submodule
*submodule
;
1066 const char *path
= NULL
;
1068 submodule
= submodule_from_name(r
, null_oid(), name
->string
);
1070 path
= submodule
->path
;
1072 path
= default_name_or_path(name
->string
);
1077 if (submodule_needs_pushing(r
, path
, commits
))
1078 string_list_insert(needs_pushing
, path
);
1081 free_submodules_oids(&submodules
);
1082 strvec_clear(&argv
);
1084 return needs_pushing
->nr
;
1087 static int push_submodule(const char *path
,
1088 const struct remote
*remote
,
1089 const struct refspec
*rs
,
1090 const struct string_list
*push_options
,
1093 if (for_each_remote_ref_submodule(path
, has_remote
, NULL
) > 0) {
1094 struct child_process cp
= CHILD_PROCESS_INIT
;
1095 strvec_push(&cp
.args
, "push");
1097 strvec_push(&cp
.args
, "--dry-run");
1099 if (push_options
&& push_options
->nr
) {
1100 const struct string_list_item
*item
;
1101 for_each_string_list_item(item
, push_options
)
1102 strvec_pushf(&cp
.args
, "--push-option=%s",
1106 if (remote
->origin
!= REMOTE_UNCONFIGURED
) {
1108 strvec_push(&cp
.args
, remote
->name
);
1109 for (i
= 0; i
< rs
->raw_nr
; i
++)
1110 strvec_push(&cp
.args
, rs
->raw
[i
]);
1113 prepare_submodule_repo_env(&cp
.env_array
);
1117 if (run_command(&cp
))
1126 * Perform a check in the submodule to see if the remote and refspec work.
1127 * Die if the submodule can't be pushed.
1129 static void submodule_push_check(const char *path
, const char *head
,
1130 const struct remote
*remote
,
1131 const struct refspec
*rs
)
1133 struct child_process cp
= CHILD_PROCESS_INIT
;
1136 strvec_push(&cp
.args
, "submodule--helper");
1137 strvec_push(&cp
.args
, "push-check");
1138 strvec_push(&cp
.args
, head
);
1139 strvec_push(&cp
.args
, remote
->name
);
1141 for (i
= 0; i
< rs
->raw_nr
; i
++)
1142 strvec_push(&cp
.args
, rs
->raw
[i
]);
1144 prepare_submodule_repo_env(&cp
.env_array
);
1151 * Simply indicate if 'submodule--helper push-check' failed.
1152 * More detailed error information will be provided by the
1155 if (run_command(&cp
))
1156 die(_("process for submodule '%s' failed"), path
);
1159 int push_unpushed_submodules(struct repository
*r
,
1160 struct oid_array
*commits
,
1161 const struct remote
*remote
,
1162 const struct refspec
*rs
,
1163 const struct string_list
*push_options
,
1167 struct string_list needs_pushing
= STRING_LIST_INIT_DUP
;
1169 if (!find_unpushed_submodules(r
, commits
,
1170 remote
->name
, &needs_pushing
))
1174 * Verify that the remote and refspec can be propagated to all
1175 * submodules. This check can be skipped if the remote and refspec
1176 * won't be propagated due to the remote being unconfigured (e.g. a URL
1177 * instead of a remote name).
1179 if (remote
->origin
!= REMOTE_UNCONFIGURED
) {
1181 struct object_id head_oid
;
1183 head
= resolve_refdup("HEAD", 0, &head_oid
, NULL
);
1185 die(_("Failed to resolve HEAD as a valid ref."));
1187 for (i
= 0; i
< needs_pushing
.nr
; i
++)
1188 submodule_push_check(needs_pushing
.items
[i
].string
,
1193 /* Actually push the submodules */
1194 for (i
= 0; i
< needs_pushing
.nr
; i
++) {
1195 const char *path
= needs_pushing
.items
[i
].string
;
1196 fprintf(stderr
, _("Pushing submodule '%s'\n"), path
);
1197 if (!push_submodule(path
, remote
, rs
,
1198 push_options
, dry_run
)) {
1199 fprintf(stderr
, _("Unable to push submodule '%s'\n"), path
);
1204 string_list_clear(&needs_pushing
, 0);
1209 static int append_oid_to_array(const char *ref
, const struct object_id
*oid
,
1210 int flags
, void *data
)
1212 struct oid_array
*array
= data
;
1213 oid_array_append(array
, oid
);
1217 void check_for_new_submodule_commits(struct object_id
*oid
)
1219 if (!initialized_fetch_ref_tips
) {
1220 for_each_ref(append_oid_to_array
, &ref_tips_before_fetch
);
1221 initialized_fetch_ref_tips
= 1;
1224 oid_array_append(&ref_tips_after_fetch
, oid
);
1227 static void calculate_changed_submodule_paths(struct repository
*r
,
1228 struct string_list
*changed_submodule_names
)
1230 struct strvec argv
= STRVEC_INIT
;
1231 struct string_list_item
*name
;
1233 /* No need to check if there are no submodules configured */
1234 if (!submodule_from_path(r
, NULL
, NULL
))
1237 strvec_push(&argv
, "--"); /* argv[0] program name */
1238 oid_array_for_each_unique(&ref_tips_after_fetch
,
1239 append_oid_to_argv
, &argv
);
1240 strvec_push(&argv
, "--not");
1241 oid_array_for_each_unique(&ref_tips_before_fetch
,
1242 append_oid_to_argv
, &argv
);
1245 * Collect all submodules (whether checked out or not) for which new
1246 * commits have been recorded upstream in "changed_submodule_names".
1248 collect_changed_submodules(r
, changed_submodule_names
, &argv
);
1250 for_each_string_list_item(name
, changed_submodule_names
) {
1251 struct oid_array
*commits
= name
->util
;
1252 const struct submodule
*submodule
;
1253 const char *path
= NULL
;
1255 submodule
= submodule_from_name(r
, null_oid(), name
->string
);
1257 path
= submodule
->path
;
1259 path
= default_name_or_path(name
->string
);
1264 if (submodule_has_commits(r
, path
, commits
)) {
1265 oid_array_clear(commits
);
1266 *name
->string
= '\0';
1270 string_list_remove_empty_items(changed_submodule_names
, 1);
1272 strvec_clear(&argv
);
1273 oid_array_clear(&ref_tips_before_fetch
);
1274 oid_array_clear(&ref_tips_after_fetch
);
1275 initialized_fetch_ref_tips
= 0;
1278 int submodule_touches_in_range(struct repository
*r
,
1279 struct object_id
*excl_oid
,
1280 struct object_id
*incl_oid
)
1282 struct string_list subs
= STRING_LIST_INIT_DUP
;
1283 struct strvec args
= STRVEC_INIT
;
1286 /* No need to check if there are no submodules configured */
1287 if (!submodule_from_path(r
, NULL
, NULL
))
1290 strvec_push(&args
, "--"); /* args[0] program name */
1291 strvec_push(&args
, oid_to_hex(incl_oid
));
1292 if (!is_null_oid(excl_oid
)) {
1293 strvec_push(&args
, "--not");
1294 strvec_push(&args
, oid_to_hex(excl_oid
));
1297 collect_changed_submodules(r
, &subs
, &args
);
1300 strvec_clear(&args
);
1302 free_submodules_oids(&subs
);
1306 struct submodule_parallel_fetch
{
1309 struct repository
*r
;
1311 int command_line_option
;
1316 struct string_list changed_submodule_names
;
1318 /* Pending fetches by OIDs */
1319 struct fetch_task
**oid_fetch_tasks
;
1320 int oid_fetch_tasks_nr
, oid_fetch_tasks_alloc
;
1322 struct strbuf submodules_with_errors
;
1324 #define SPF_INIT {0, STRVEC_INIT, NULL, NULL, 0, 0, 0, 0, \
1325 STRING_LIST_INIT_DUP, \
1326 NULL, 0, 0, STRBUF_INIT}
1328 static int get_fetch_recurse_config(const struct submodule
*submodule
,
1329 struct submodule_parallel_fetch
*spf
)
1331 if (spf
->command_line_option
!= RECURSE_SUBMODULES_DEFAULT
)
1332 return spf
->command_line_option
;
1338 int fetch_recurse
= submodule
->fetch_recurse
;
1339 key
= xstrfmt("submodule.%s.fetchRecurseSubmodules", submodule
->name
);
1340 if (!repo_config_get_string_tmp(spf
->r
, key
, &value
)) {
1341 fetch_recurse
= parse_fetch_recurse_submodules_arg(key
, value
);
1345 if (fetch_recurse
!= RECURSE_SUBMODULES_NONE
)
1346 /* local config overrules everything except commandline */
1347 return fetch_recurse
;
1350 return spf
->default_option
;
1354 * Fetch in progress (if callback data) or
1355 * pending (if in oid_fetch_tasks in struct submodule_parallel_fetch)
1358 struct repository
*repo
;
1359 const struct submodule
*sub
;
1360 unsigned free_sub
: 1; /* Do we need to free the submodule? */
1362 struct oid_array
*commits
; /* Ensure these commits are fetched */
1366 * When a submodule is not defined in .gitmodules, we cannot access it
1367 * via the regular submodule-config. Create a fake submodule, which we can
1370 static const struct submodule
*get_non_gitmodules_submodule(const char *path
)
1372 struct submodule
*ret
= NULL
;
1373 const char *name
= default_name_or_path(path
);
1378 ret
= xmalloc(sizeof(*ret
));
1379 memset(ret
, 0, sizeof(*ret
));
1383 return (const struct submodule
*) ret
;
1386 static struct fetch_task
*fetch_task_create(struct repository
*r
,
1389 struct fetch_task
*task
= xmalloc(sizeof(*task
));
1390 memset(task
, 0, sizeof(*task
));
1392 task
->sub
= submodule_from_path(r
, null_oid(), path
);
1395 * No entry in .gitmodules? Technically not a submodule,
1396 * but historically we supported repositories that happen to be
1397 * in-place where a gitlink is. Keep supporting them.
1399 task
->sub
= get_non_gitmodules_submodule(path
);
1411 static void fetch_task_release(struct fetch_task
*p
)
1414 free((void*)p
->sub
);
1419 repo_clear(p
->repo
);
1420 FREE_AND_NULL(p
->repo
);
1423 static struct repository
*get_submodule_repo_for(struct repository
*r
,
1424 const struct submodule
*sub
)
1426 struct repository
*ret
= xmalloc(sizeof(*ret
));
1428 if (repo_submodule_init(ret
, r
, sub
)) {
1430 * No entry in .gitmodules? Technically not a submodule,
1431 * but historically we supported repositories that happen to be
1432 * in-place where a gitlink is. Keep supporting them.
1434 struct strbuf gitdir
= STRBUF_INIT
;
1435 strbuf_repo_worktree_path(&gitdir
, r
, "%s/.git", sub
->path
);
1436 if (repo_init(ret
, gitdir
.buf
, NULL
)) {
1437 strbuf_release(&gitdir
);
1441 strbuf_release(&gitdir
);
1447 static int get_next_submodule(struct child_process
*cp
,
1448 struct strbuf
*err
, void *data
, void **task_cb
)
1450 struct submodule_parallel_fetch
*spf
= data
;
1452 for (; spf
->count
< spf
->r
->index
->cache_nr
; spf
->count
++) {
1453 const struct cache_entry
*ce
= spf
->r
->index
->cache
[spf
->count
];
1454 const char *default_argv
;
1455 struct fetch_task
*task
;
1457 if (!S_ISGITLINK(ce
->ce_mode
))
1460 task
= fetch_task_create(spf
->r
, ce
->name
);
1464 switch (get_fetch_recurse_config(task
->sub
, spf
))
1467 case RECURSE_SUBMODULES_DEFAULT
:
1468 case RECURSE_SUBMODULES_ON_DEMAND
:
1470 !string_list_lookup(
1471 &spf
->changed_submodule_names
,
1474 default_argv
= "on-demand";
1476 case RECURSE_SUBMODULES_ON
:
1477 default_argv
= "yes";
1479 case RECURSE_SUBMODULES_OFF
:
1483 task
->repo
= get_submodule_repo_for(spf
->r
, task
->sub
);
1485 struct strbuf submodule_prefix
= STRBUF_INIT
;
1486 child_process_init(cp
);
1487 cp
->dir
= task
->repo
->gitdir
;
1488 prepare_submodule_repo_env_in_gitdir(&cp
->env_array
);
1491 strbuf_addf(err
, _("Fetching submodule %s%s\n"),
1492 spf
->prefix
, ce
->name
);
1493 strvec_init(&cp
->args
);
1494 strvec_pushv(&cp
->args
, spf
->args
.v
);
1495 strvec_push(&cp
->args
, default_argv
);
1496 strvec_push(&cp
->args
, "--submodule-prefix");
1498 strbuf_addf(&submodule_prefix
, "%s%s/",
1501 strvec_push(&cp
->args
, submodule_prefix
.buf
);
1506 strbuf_release(&submodule_prefix
);
1509 struct strbuf empty_submodule_path
= STRBUF_INIT
;
1511 fetch_task_release(task
);
1515 * An empty directory is normal,
1516 * the submodule is not initialized
1518 strbuf_addf(&empty_submodule_path
, "%s/%s/",
1521 if (S_ISGITLINK(ce
->ce_mode
) &&
1522 !is_empty_dir(empty_submodule_path
.buf
)) {
1525 _("Could not access submodule '%s'\n"),
1528 strbuf_release(&empty_submodule_path
);
1532 if (spf
->oid_fetch_tasks_nr
) {
1533 struct fetch_task
*task
=
1534 spf
->oid_fetch_tasks
[spf
->oid_fetch_tasks_nr
- 1];
1535 struct strbuf submodule_prefix
= STRBUF_INIT
;
1536 spf
->oid_fetch_tasks_nr
--;
1538 strbuf_addf(&submodule_prefix
, "%s%s/",
1539 spf
->prefix
, task
->sub
->path
);
1541 child_process_init(cp
);
1542 prepare_submodule_repo_env_in_gitdir(&cp
->env_array
);
1544 cp
->dir
= task
->repo
->gitdir
;
1546 strvec_init(&cp
->args
);
1547 strvec_pushv(&cp
->args
, spf
->args
.v
);
1548 strvec_push(&cp
->args
, "on-demand");
1549 strvec_push(&cp
->args
, "--submodule-prefix");
1550 strvec_push(&cp
->args
, submodule_prefix
.buf
);
1552 /* NEEDSWORK: have get_default_remote from submodule--helper */
1553 strvec_push(&cp
->args
, "origin");
1554 oid_array_for_each_unique(task
->commits
,
1555 append_oid_to_argv
, &cp
->args
);
1558 strbuf_release(&submodule_prefix
);
1565 static int fetch_start_failure(struct strbuf
*err
,
1566 void *cb
, void *task_cb
)
1568 struct submodule_parallel_fetch
*spf
= cb
;
1569 struct fetch_task
*task
= task_cb
;
1573 fetch_task_release(task
);
1577 static int commit_missing_in_sub(const struct object_id
*oid
, void *data
)
1579 struct repository
*subrepo
= data
;
1581 enum object_type type
= oid_object_info(subrepo
, oid
, NULL
);
1583 return type
!= OBJ_COMMIT
;
1586 static int fetch_finish(int retvalue
, struct strbuf
*err
,
1587 void *cb
, void *task_cb
)
1589 struct submodule_parallel_fetch
*spf
= cb
;
1590 struct fetch_task
*task
= task_cb
;
1592 struct string_list_item
*it
;
1593 struct oid_array
*commits
;
1595 if (!task
|| !task
->sub
)
1596 BUG("callback cookie bogus");
1600 * NEEDSWORK: This indicates that the overall fetch
1601 * failed, even though there may be a subsequent fetch
1602 * by commit hash that might work. It may be a good
1603 * idea to not indicate failure in this case, and only
1604 * indicate failure if the subsequent fetch fails.
1608 strbuf_addf(&spf
->submodules_with_errors
, "\t%s\n",
1612 /* Is this the second time we process this submodule? */
1616 it
= string_list_lookup(&spf
->changed_submodule_names
, task
->sub
->name
);
1618 /* Could be an unchanged submodule, not contained in the list */
1622 oid_array_filter(commits
,
1623 commit_missing_in_sub
,
1626 /* Are there commits we want, but do not exist? */
1628 task
->commits
= commits
;
1629 ALLOC_GROW(spf
->oid_fetch_tasks
,
1630 spf
->oid_fetch_tasks_nr
+ 1,
1631 spf
->oid_fetch_tasks_alloc
);
1632 spf
->oid_fetch_tasks
[spf
->oid_fetch_tasks_nr
] = task
;
1633 spf
->oid_fetch_tasks_nr
++;
1638 fetch_task_release(task
);
1643 int fetch_populated_submodules(struct repository
*r
,
1644 const struct strvec
*options
,
1645 const char *prefix
, int command_line_option
,
1647 int quiet
, int max_parallel_jobs
)
1650 struct submodule_parallel_fetch spf
= SPF_INIT
;
1653 spf
.command_line_option
= command_line_option
;
1654 spf
.default_option
= default_option
;
1656 spf
.prefix
= prefix
;
1661 if (repo_read_index(r
) < 0)
1662 die(_("index file corrupt"));
1664 strvec_push(&spf
.args
, "fetch");
1665 for (i
= 0; i
< options
->nr
; i
++)
1666 strvec_push(&spf
.args
, options
->v
[i
]);
1667 strvec_push(&spf
.args
, "--recurse-submodules-default");
1668 /* default value, "--submodule-prefix" and its value are added later */
1670 calculate_changed_submodule_paths(r
, &spf
.changed_submodule_names
);
1671 string_list_sort(&spf
.changed_submodule_names
);
1672 run_processes_parallel_tr2(max_parallel_jobs
,
1674 fetch_start_failure
,
1677 "submodule", "parallel/fetch");
1679 if (spf
.submodules_with_errors
.len
> 0)
1680 fprintf(stderr
, _("Errors during submodule fetch:\n%s"),
1681 spf
.submodules_with_errors
.buf
);
1684 strvec_clear(&spf
.args
);
1686 free_submodules_oids(&spf
.changed_submodule_names
);
1690 unsigned is_submodule_modified(const char *path
, int ignore_untracked
)
1692 struct child_process cp
= CHILD_PROCESS_INIT
;
1693 struct strbuf buf
= STRBUF_INIT
;
1695 unsigned dirty_submodule
= 0;
1696 const char *git_dir
;
1697 int ignore_cp_exit_code
= 0;
1699 strbuf_addf(&buf
, "%s/.git", path
);
1700 git_dir
= read_gitfile(buf
.buf
);
1703 if (!is_git_directory(git_dir
)) {
1704 if (is_directory(git_dir
))
1705 die(_("'%s' not recognized as a git repository"), git_dir
);
1706 strbuf_release(&buf
);
1707 /* The submodule is not checked out, so it is not modified */
1712 strvec_pushl(&cp
.args
, "status", "--porcelain=2", NULL
);
1713 if (ignore_untracked
)
1714 strvec_push(&cp
.args
, "-uno");
1716 prepare_submodule_repo_env(&cp
.env_array
);
1721 if (start_command(&cp
))
1722 die(_("Could not run 'git status --porcelain=2' in submodule %s"), path
);
1724 fp
= xfdopen(cp
.out
, "r");
1725 while (strbuf_getwholeline(&buf
, fp
, '\n') != EOF
) {
1726 /* regular untracked files */
1727 if (buf
.buf
[0] == '?')
1728 dirty_submodule
|= DIRTY_SUBMODULE_UNTRACKED
;
1730 if (buf
.buf
[0] == 'u' ||
1731 buf
.buf
[0] == '1' ||
1732 buf
.buf
[0] == '2') {
1733 /* T = line type, XY = status, SSSS = submodule state */
1734 if (buf
.len
< strlen("T XY SSSS"))
1735 BUG("invalid status --porcelain=2 line %s",
1738 if (buf
.buf
[5] == 'S' && buf
.buf
[8] == 'U')
1739 /* nested untracked file */
1740 dirty_submodule
|= DIRTY_SUBMODULE_UNTRACKED
;
1742 if (buf
.buf
[0] == 'u' ||
1743 buf
.buf
[0] == '2' ||
1744 memcmp(buf
.buf
+ 5, "S..U", 4))
1746 dirty_submodule
|= DIRTY_SUBMODULE_MODIFIED
;
1749 if ((dirty_submodule
& DIRTY_SUBMODULE_MODIFIED
) &&
1750 ((dirty_submodule
& DIRTY_SUBMODULE_UNTRACKED
) ||
1751 ignore_untracked
)) {
1753 * We're not interested in any further information from
1754 * the child any more, neither output nor its exit code.
1756 ignore_cp_exit_code
= 1;
1762 if (finish_command(&cp
) && !ignore_cp_exit_code
)
1763 die(_("'git status --porcelain=2' failed in submodule %s"), path
);
1765 strbuf_release(&buf
);
1766 return dirty_submodule
;
1769 int submodule_uses_gitfile(const char *path
)
1771 struct child_process cp
= CHILD_PROCESS_INIT
;
1772 struct strbuf buf
= STRBUF_INIT
;
1773 const char *git_dir
;
1775 strbuf_addf(&buf
, "%s/.git", path
);
1776 git_dir
= read_gitfile(buf
.buf
);
1778 strbuf_release(&buf
);
1781 strbuf_release(&buf
);
1783 /* Now test that all nested submodules use a gitfile too */
1784 strvec_pushl(&cp
.args
,
1785 "submodule", "foreach", "--quiet", "--recursive",
1786 "test -f .git", NULL
);
1788 prepare_submodule_repo_env(&cp
.env_array
);
1794 if (run_command(&cp
))
1801 * Check if it is a bad idea to remove a submodule, i.e. if we'd lose data
1804 * Return 1 if we'd lose data, return 0 if the removal is fine,
1805 * and negative values for errors.
1807 int bad_to_remove_submodule(const char *path
, unsigned flags
)
1810 struct child_process cp
= CHILD_PROCESS_INIT
;
1811 struct strbuf buf
= STRBUF_INIT
;
1814 if (!file_exists(path
) || is_empty_dir(path
))
1817 if (!submodule_uses_gitfile(path
))
1820 strvec_pushl(&cp
.args
, "status", "--porcelain",
1821 "--ignore-submodules=none", NULL
);
1823 if (flags
& SUBMODULE_REMOVAL_IGNORE_UNTRACKED
)
1824 strvec_push(&cp
.args
, "-uno");
1826 strvec_push(&cp
.args
, "-uall");
1828 if (!(flags
& SUBMODULE_REMOVAL_IGNORE_IGNORED_UNTRACKED
))
1829 strvec_push(&cp
.args
, "--ignored");
1831 prepare_submodule_repo_env(&cp
.env_array
);
1836 if (start_command(&cp
)) {
1837 if (flags
& SUBMODULE_REMOVAL_DIE_ON_ERROR
)
1838 die(_("could not start 'git status' in submodule '%s'"),
1844 len
= strbuf_read(&buf
, cp
.out
, 1024);
1849 if (finish_command(&cp
)) {
1850 if (flags
& SUBMODULE_REMOVAL_DIE_ON_ERROR
)
1851 die(_("could not run 'git status' in submodule '%s'"),
1856 strbuf_release(&buf
);
1860 void submodule_unset_core_worktree(const struct submodule
*sub
)
1862 struct strbuf config_path
= STRBUF_INIT
;
1864 submodule_name_to_gitdir(&config_path
, the_repository
, sub
->name
);
1865 strbuf_addstr(&config_path
, "/config");
1867 if (git_config_set_in_file_gently(config_path
.buf
, "core.worktree", NULL
))
1868 warning(_("Could not unset core.worktree setting in submodule '%s'"),
1871 strbuf_release(&config_path
);
1874 static const char *get_super_prefix_or_empty(void)
1876 const char *s
= get_super_prefix();
1882 static int submodule_has_dirty_index(const struct submodule
*sub
)
1884 struct child_process cp
= CHILD_PROCESS_INIT
;
1886 prepare_submodule_repo_env(&cp
.env_array
);
1889 strvec_pushl(&cp
.args
, "diff-index", "--quiet",
1890 "--cached", "HEAD", NULL
);
1894 if (start_command(&cp
))
1895 die(_("could not recurse into submodule '%s'"), sub
->path
);
1897 return finish_command(&cp
);
1900 static void submodule_reset_index(const char *path
)
1902 struct child_process cp
= CHILD_PROCESS_INIT
;
1903 prepare_submodule_repo_env(&cp
.env_array
);
1909 strvec_pushf(&cp
.args
, "--super-prefix=%s%s/",
1910 get_super_prefix_or_empty(), path
);
1911 strvec_pushl(&cp
.args
, "read-tree", "-u", "--reset", NULL
);
1913 strvec_push(&cp
.args
, empty_tree_oid_hex());
1915 if (run_command(&cp
))
1916 die(_("could not reset submodule index"));
1920 * Moves a submodule at a given path from a given head to another new head.
1921 * For edge cases (a submodule coming into existence or removing a submodule)
1922 * pass NULL for old or new respectively.
1924 int submodule_move_head(const char *path
,
1925 const char *old_head
,
1926 const char *new_head
,
1930 struct child_process cp
= CHILD_PROCESS_INIT
;
1931 const struct submodule
*sub
;
1932 int *error_code_ptr
, error_code
;
1934 if (!is_submodule_active(the_repository
, path
))
1937 if (flags
& SUBMODULE_MOVE_HEAD_FORCE
)
1939 * Pass non NULL pointer to is_submodule_populated_gently
1940 * to prevent die()-ing. We'll use connect_work_tree_and_git_dir
1941 * to fixup the submodule in the force case later.
1943 error_code_ptr
= &error_code
;
1945 error_code_ptr
= NULL
;
1947 if (old_head
&& !is_submodule_populated_gently(path
, error_code_ptr
))
1950 sub
= submodule_from_path(the_repository
, null_oid(), path
);
1953 BUG("could not get submodule information for '%s'", path
);
1955 if (old_head
&& !(flags
& SUBMODULE_MOVE_HEAD_FORCE
)) {
1956 /* Check if the submodule has a dirty index. */
1957 if (submodule_has_dirty_index(sub
))
1958 return error(_("submodule '%s' has dirty index"), path
);
1961 if (!(flags
& SUBMODULE_MOVE_HEAD_DRY_RUN
)) {
1963 if (!submodule_uses_gitfile(path
))
1964 absorb_git_dir_into_superproject(path
,
1965 ABSORB_GITDIR_RECURSE_SUBMODULES
);
1967 struct strbuf gitdir
= STRBUF_INIT
;
1968 submodule_name_to_gitdir(&gitdir
, the_repository
,
1970 connect_work_tree_and_git_dir(path
, gitdir
.buf
, 0);
1971 strbuf_release(&gitdir
);
1973 /* make sure the index is clean as well */
1974 submodule_reset_index(path
);
1977 if (old_head
&& (flags
& SUBMODULE_MOVE_HEAD_FORCE
)) {
1978 struct strbuf gitdir
= STRBUF_INIT
;
1979 submodule_name_to_gitdir(&gitdir
, the_repository
,
1981 connect_work_tree_and_git_dir(path
, gitdir
.buf
, 1);
1982 strbuf_release(&gitdir
);
1986 prepare_submodule_repo_env(&cp
.env_array
);
1992 strvec_pushf(&cp
.args
, "--super-prefix=%s%s/",
1993 get_super_prefix_or_empty(), path
);
1994 strvec_pushl(&cp
.args
, "read-tree", "--recurse-submodules", NULL
);
1996 if (flags
& SUBMODULE_MOVE_HEAD_DRY_RUN
)
1997 strvec_push(&cp
.args
, "-n");
1999 strvec_push(&cp
.args
, "-u");
2001 if (flags
& SUBMODULE_MOVE_HEAD_FORCE
)
2002 strvec_push(&cp
.args
, "--reset");
2004 strvec_push(&cp
.args
, "-m");
2006 if (!(flags
& SUBMODULE_MOVE_HEAD_FORCE
))
2007 strvec_push(&cp
.args
, old_head
? old_head
: empty_tree_oid_hex());
2009 strvec_push(&cp
.args
, new_head
? new_head
: empty_tree_oid_hex());
2011 if (run_command(&cp
)) {
2012 ret
= error(_("Submodule '%s' could not be updated."), path
);
2016 if (!(flags
& SUBMODULE_MOVE_HEAD_DRY_RUN
)) {
2018 child_process_init(&cp
);
2019 /* also set the HEAD accordingly */
2024 prepare_submodule_repo_env(&cp
.env_array
);
2025 strvec_pushl(&cp
.args
, "update-ref", "HEAD",
2026 "--no-deref", new_head
, NULL
);
2028 if (run_command(&cp
)) {
2033 struct strbuf sb
= STRBUF_INIT
;
2035 strbuf_addf(&sb
, "%s/.git", path
);
2036 unlink_or_warn(sb
.buf
);
2037 strbuf_release(&sb
);
2039 if (is_empty_dir(path
))
2040 rmdir_or_warn(path
);
2042 submodule_unset_core_worktree(sub
);
2049 int validate_submodule_git_dir(char *git_dir
, const char *submodule_name
)
2051 size_t len
= strlen(git_dir
), suffix_len
= strlen(submodule_name
);
2055 if (len
<= suffix_len
|| (p
= git_dir
+ len
- suffix_len
)[-1] != '/' ||
2056 strcmp(p
, submodule_name
))
2057 BUG("submodule name '%s' not a suffix of git dir '%s'",
2058 submodule_name
, git_dir
);
2061 * We prevent the contents of sibling submodules' git directories to
2064 * Example: having a submodule named `hippo` and another one named
2065 * `hippo/hooks` would result in the git directories
2066 * `.git/modules/hippo/` and `.git/modules/hippo/hooks/`, respectively,
2067 * but the latter directory is already designated to contain the hooks
2071 if (is_dir_sep(*p
)) {
2075 if (is_git_directory(git_dir
))
2080 return error(_("submodule git dir '%s' is "
2081 "inside git dir '%.*s'"),
2083 (int)(p
- git_dir
), git_dir
);
2091 * Embeds a single submodules git directory into the superprojects git dir,
2094 static void relocate_single_git_dir_into_superproject(const char *path
)
2096 char *old_git_dir
= NULL
, *real_old_git_dir
= NULL
, *real_new_git_dir
= NULL
;
2097 struct strbuf new_gitdir
= STRBUF_INIT
;
2098 const struct submodule
*sub
;
2100 if (submodule_uses_worktrees(path
))
2101 die(_("relocate_gitdir for submodule '%s' with "
2102 "more than one worktree not supported"), path
);
2104 old_git_dir
= xstrfmt("%s/.git", path
);
2105 if (read_gitfile(old_git_dir
))
2106 /* If it is an actual gitfile, it doesn't need migration. */
2109 real_old_git_dir
= real_pathdup(old_git_dir
, 1);
2111 sub
= submodule_from_path(the_repository
, null_oid(), path
);
2113 die(_("could not lookup name for submodule '%s'"), path
);
2115 submodule_name_to_gitdir(&new_gitdir
, the_repository
, sub
->name
);
2116 if (validate_submodule_git_dir(new_gitdir
.buf
, sub
->name
) < 0)
2117 die(_("refusing to move '%s' into an existing git dir"),
2119 if (safe_create_leading_directories_const(new_gitdir
.buf
) < 0)
2120 die(_("could not create directory '%s'"), new_gitdir
.buf
);
2121 real_new_git_dir
= real_pathdup(new_gitdir
.buf
, 1);
2123 fprintf(stderr
, _("Migrating git directory of '%s%s' from\n'%s' to\n'%s'\n"),
2124 get_super_prefix_or_empty(), path
,
2125 real_old_git_dir
, real_new_git_dir
);
2127 relocate_gitdir(path
, real_old_git_dir
, real_new_git_dir
);
2130 free(real_old_git_dir
);
2131 free(real_new_git_dir
);
2132 strbuf_release(&new_gitdir
);
2136 * Migrate the git directory of the submodule given by path from
2137 * having its git directory within the working tree to the git dir nested
2138 * in its superprojects git dir under modules/.
2140 void absorb_git_dir_into_superproject(const char *path
,
2144 const char *sub_git_dir
;
2145 struct strbuf gitdir
= STRBUF_INIT
;
2146 strbuf_addf(&gitdir
, "%s/.git", path
);
2147 sub_git_dir
= resolve_gitdir_gently(gitdir
.buf
, &err_code
);
2149 /* Not populated? */
2151 const struct submodule
*sub
;
2152 struct strbuf sub_gitdir
= STRBUF_INIT
;
2154 if (err_code
== READ_GITFILE_ERR_STAT_FAILED
) {
2155 /* unpopulated as expected */
2156 strbuf_release(&gitdir
);
2160 if (err_code
!= READ_GITFILE_ERR_NOT_A_REPO
)
2161 /* We don't know what broke here. */
2162 read_gitfile_error_die(err_code
, path
, NULL
);
2165 * Maybe populated, but no git directory was found?
2166 * This can happen if the superproject is a submodule
2167 * itself and was just absorbed. The absorption of the
2168 * superproject did not rewrite the git file links yet,
2171 sub
= submodule_from_path(the_repository
, null_oid(), path
);
2173 die(_("could not lookup name for submodule '%s'"), path
);
2174 submodule_name_to_gitdir(&sub_gitdir
, the_repository
, sub
->name
);
2175 connect_work_tree_and_git_dir(path
, sub_gitdir
.buf
, 0);
2176 strbuf_release(&sub_gitdir
);
2178 /* Is it already absorbed into the superprojects git dir? */
2179 char *real_sub_git_dir
= real_pathdup(sub_git_dir
, 1);
2180 char *real_common_git_dir
= real_pathdup(get_git_common_dir(), 1);
2182 if (!starts_with(real_sub_git_dir
, real_common_git_dir
))
2183 relocate_single_git_dir_into_superproject(path
);
2185 free(real_sub_git_dir
);
2186 free(real_common_git_dir
);
2188 strbuf_release(&gitdir
);
2190 if (flags
& ABSORB_GITDIR_RECURSE_SUBMODULES
) {
2191 struct child_process cp
= CHILD_PROCESS_INIT
;
2192 struct strbuf sb
= STRBUF_INIT
;
2194 if (flags
& ~ABSORB_GITDIR_RECURSE_SUBMODULES
)
2195 BUG("we don't know how to pass the flags down?");
2197 strbuf_addstr(&sb
, get_super_prefix_or_empty());
2198 strbuf_addstr(&sb
, path
);
2199 strbuf_addch(&sb
, '/');
2204 strvec_pushl(&cp
.args
, "--super-prefix", sb
.buf
,
2205 "submodule--helper",
2206 "absorb-git-dirs", NULL
);
2207 prepare_submodule_repo_env(&cp
.env_array
);
2208 if (run_command(&cp
))
2209 die(_("could not recurse into submodule '%s'"), path
);
2211 strbuf_release(&sb
);
2215 int get_superproject_working_tree(struct strbuf
*buf
)
2217 struct child_process cp
= CHILD_PROCESS_INIT
;
2218 struct strbuf sb
= STRBUF_INIT
;
2219 struct strbuf one_up
= STRBUF_INIT
;
2220 const char *cwd
= xgetcwd();
2222 const char *subpath
;
2226 if (!is_inside_work_tree())
2229 * We might have a superproject, but it is harder
2234 if (!strbuf_realpath(&one_up
, "../", 0))
2237 subpath
= relative_path(cwd
, one_up
.buf
, &sb
);
2238 strbuf_release(&one_up
);
2240 prepare_submodule_repo_env(&cp
.env_array
);
2241 strvec_pop(&cp
.env_array
);
2243 strvec_pushl(&cp
.args
, "--literal-pathspecs", "-C", "..",
2244 "ls-files", "-z", "--stage", "--full-name", "--",
2253 if (start_command(&cp
))
2254 die(_("could not start ls-files in .."));
2256 len
= strbuf_read(&sb
, cp
.out
, PATH_MAX
);
2259 if (starts_with(sb
.buf
, "160000")) {
2261 int cwd_len
= strlen(cwd
);
2262 char *super_sub
, *super_wt
;
2265 * There is a superproject having this repo as a submodule.
2266 * The format is <mode> SP <hash> SP <stage> TAB <full name> \0,
2267 * We're only interested in the name after the tab.
2269 super_sub
= strchr(sb
.buf
, '\t') + 1;
2270 super_sub_len
= strlen(super_sub
);
2272 if (super_sub_len
> cwd_len
||
2273 strcmp(&cwd
[cwd_len
- super_sub_len
], super_sub
))
2274 BUG("returned path string doesn't match cwd?");
2276 super_wt
= xstrdup(cwd
);
2277 super_wt
[cwd_len
- super_sub_len
] = '\0';
2279 strbuf_realpath(buf
, super_wt
, 1);
2283 strbuf_release(&sb
);
2285 code
= finish_command(&cp
);
2288 /* '../' is not a git repository */
2290 if (code
== 0 && len
== 0)
2291 /* There is an unrelated git repository at '../' */
2294 die(_("ls-tree returned unexpected return code %d"), code
);
2300 * Put the gitdir for a submodule (given relative to the main
2301 * repository worktree) into `buf`, or return -1 on error.
2303 int submodule_to_gitdir(struct strbuf
*buf
, const char *submodule
)
2305 const struct submodule
*sub
;
2306 const char *git_dir
;
2310 strbuf_addstr(buf
, submodule
);
2311 strbuf_complete(buf
, '/');
2312 strbuf_addstr(buf
, ".git");
2314 git_dir
= read_gitfile(buf
->buf
);
2317 strbuf_addstr(buf
, git_dir
);
2319 if (!is_git_directory(buf
->buf
)) {
2320 sub
= submodule_from_path(the_repository
, null_oid(),
2327 submodule_name_to_gitdir(buf
, the_repository
, sub
->name
);
2334 void submodule_name_to_gitdir(struct strbuf
*buf
, struct repository
*r
,
2335 const char *submodule_name
)
2338 * NEEDSWORK: The current way of mapping a submodule's name to
2339 * its location in .git/modules/ has problems with some naming
2340 * schemes. For example, if a submodule is named "foo" and
2341 * another is named "foo/bar" (whether present in the same
2342 * superproject commit or not - the problem will arise if both
2343 * superproject commits have been checked out at any point in
2344 * time), or if two submodule names only have different cases in
2345 * a case-insensitive filesystem.
2347 * There are several solutions, including encoding the path in
2348 * some way, introducing a submodule.<name>.gitdir config in
2349 * .git/config (not .gitmodules) that allows overriding what the
2350 * gitdir of a submodule would be (and teach Git, upon noticing
2351 * a clash, to automatically determine a non-clashing name and
2352 * to write such a config), or introducing a
2353 * submodule.<name>.gitdir config in .gitmodules that repo
2354 * administrators can explicitly set. Nothing has been decided,
2355 * so for now, just append the name at the end of the path.
2357 strbuf_repo_git_path(buf
, r
, "modules/");
2358 strbuf_addstr(buf
, submodule_name
);