2 #include "submodule-config.h"
8 #include "run-command.h"
11 #include "string-list.h"
12 #include "sha1-array.h"
13 #include "argv-array.h"
15 #include "thread-utils.h"
20 static int config_fetch_recurse_submodules
= RECURSE_SUBMODULES_ON_DEMAND
;
21 static int config_update_recurse_submodules
= RECURSE_SUBMODULES_OFF
;
22 static int parallel_jobs
= 1;
23 static struct string_list changed_submodule_paths
= STRING_LIST_INIT_DUP
;
24 static int initialized_fetch_ref_tips
;
25 static struct oid_array ref_tips_before_fetch
;
26 static struct oid_array ref_tips_after_fetch
;
29 * The following flag is set if the .gitmodules file is unmerged. We then
30 * disable recursion for all submodules where .git/config doesn't have a
31 * matching config entry because we can't guess what might be configured in
32 * .gitmodules unless the user resolves the conflict. When a command line
33 * option is given (which always overrides configuration) this flag will be
36 static int gitmodules_is_unmerged
;
39 * This flag is set if the .gitmodules file had unstaged modifications on
40 * startup. This must be checked before allowing modifications to the
41 * .gitmodules file with the intention to stage them later, because when
42 * continuing we would stage the modifications the user didn't stage herself
43 * too. That might change in a future version when we learn to stage the
44 * changes we do ourselves without staging any previous modifications.
46 static int gitmodules_is_modified
;
48 int is_staging_gitmodules_ok(void)
50 return !gitmodules_is_modified
;
54 * Try to update the "path" entry in the "submodule.<name>" section of the
55 * .gitmodules file. Return 0 only if a .gitmodules file was found, a section
56 * with the correct path=<oldpath> setting was found and we could update it.
58 int update_path_in_gitmodules(const char *oldpath
, const char *newpath
)
60 struct strbuf entry
= STRBUF_INIT
;
61 const struct submodule
*submodule
;
63 if (!file_exists(".gitmodules")) /* Do nothing without .gitmodules */
66 if (gitmodules_is_unmerged
)
67 die(_("Cannot change unmerged .gitmodules, resolve merge conflicts first"));
69 submodule
= submodule_from_path(null_sha1
, oldpath
);
70 if (!submodule
|| !submodule
->name
) {
71 warning(_("Could not find section in .gitmodules where path=%s"), oldpath
);
74 strbuf_addstr(&entry
, "submodule.");
75 strbuf_addstr(&entry
, submodule
->name
);
76 strbuf_addstr(&entry
, ".path");
77 if (git_config_set_in_file_gently(".gitmodules", entry
.buf
, newpath
) < 0) {
78 /* Maybe the user already did that, don't error out here */
79 warning(_("Could not update .gitmodules entry %s"), entry
.buf
);
80 strbuf_release(&entry
);
83 strbuf_release(&entry
);
88 * Try to remove the "submodule.<name>" section from .gitmodules where the given
89 * path is configured. Return 0 only if a .gitmodules file was found, a section
90 * with the correct path=<path> setting was found and we could remove it.
92 int remove_path_from_gitmodules(const char *path
)
94 struct strbuf sect
= STRBUF_INIT
;
95 const struct submodule
*submodule
;
97 if (!file_exists(".gitmodules")) /* Do nothing without .gitmodules */
100 if (gitmodules_is_unmerged
)
101 die(_("Cannot change unmerged .gitmodules, resolve merge conflicts first"));
103 submodule
= submodule_from_path(null_sha1
, path
);
104 if (!submodule
|| !submodule
->name
) {
105 warning(_("Could not find section in .gitmodules where path=%s"), path
);
108 strbuf_addstr(§
, "submodule.");
109 strbuf_addstr(§
, submodule
->name
);
110 if (git_config_rename_section_in_file(".gitmodules", sect
.buf
, NULL
) < 0) {
111 /* Maybe the user already did that, don't error out here */
112 warning(_("Could not remove .gitmodules entry for %s"), path
);
113 strbuf_release(§
);
116 strbuf_release(§
);
120 void stage_updated_gitmodules(void)
122 if (add_file_to_cache(".gitmodules", 0))
123 die(_("staging updated .gitmodules failed"));
126 static int add_submodule_odb(const char *path
)
128 struct strbuf objects_directory
= STRBUF_INIT
;
131 ret
= strbuf_git_path_submodule(&objects_directory
, path
, "objects/");
134 if (!is_directory(objects_directory
.buf
)) {
138 add_to_alternates_memory(objects_directory
.buf
);
140 strbuf_release(&objects_directory
);
144 void set_diffopt_flags_from_submodule_config(struct diff_options
*diffopt
,
147 const struct submodule
*submodule
= submodule_from_path(null_sha1
, path
);
149 if (submodule
->ignore
)
150 handle_ignore_submodules_arg(diffopt
, submodule
->ignore
);
151 else if (gitmodules_is_unmerged
)
152 DIFF_OPT_SET(diffopt
, IGNORE_SUBMODULES
);
156 int submodule_config(const char *var
, const char *value
, void *cb
)
158 if (!strcmp(var
, "submodule.fetchjobs")) {
159 parallel_jobs
= git_config_int(var
, value
);
160 if (parallel_jobs
< 0)
161 die(_("negative values not allowed for submodule.fetchJobs"));
163 } else if (starts_with(var
, "submodule."))
164 return parse_submodule_config_option(var
, value
);
165 else if (!strcmp(var
, "fetch.recursesubmodules")) {
166 config_fetch_recurse_submodules
= parse_fetch_recurse_submodules_arg(var
, value
);
172 int option_parse_recurse_submodules_worktree_updater(const struct option
*opt
,
173 const char *arg
, int unset
)
176 config_update_recurse_submodules
= RECURSE_SUBMODULES_OFF
;
180 config_update_recurse_submodules
=
181 parse_update_recurse_submodules_arg(opt
->long_name
,
184 config_update_recurse_submodules
= RECURSE_SUBMODULES_ON
;
189 void load_submodule_cache(void)
191 if (config_update_recurse_submodules
== RECURSE_SUBMODULES_OFF
)
195 git_config(submodule_config
, NULL
);
198 void gitmodules_config(void)
200 const char *work_tree
= get_git_work_tree();
202 struct strbuf gitmodules_path
= STRBUF_INIT
;
204 strbuf_addstr(&gitmodules_path
, work_tree
);
205 strbuf_addstr(&gitmodules_path
, "/.gitmodules");
206 if (read_cache() < 0)
207 die("index file corrupt");
208 pos
= cache_name_pos(".gitmodules", 11);
209 if (pos
< 0) { /* .gitmodules not found or isn't merged */
211 if (active_nr
> pos
) { /* there is a .gitmodules */
212 const struct cache_entry
*ce
= active_cache
[pos
];
213 if (ce_namelen(ce
) == 11 &&
214 !memcmp(ce
->name
, ".gitmodules", 11))
215 gitmodules_is_unmerged
= 1;
217 } else if (pos
< active_nr
) {
219 if (lstat(".gitmodules", &st
) == 0 &&
220 ce_match_stat(active_cache
[pos
], &st
, 0) & DATA_CHANGED
)
221 gitmodules_is_modified
= 1;
224 if (!gitmodules_is_unmerged
)
225 git_config_from_file(submodule_config
, gitmodules_path
.buf
, NULL
);
226 strbuf_release(&gitmodules_path
);
230 void gitmodules_config_sha1(const unsigned char *commit_sha1
)
232 struct strbuf rev
= STRBUF_INIT
;
233 unsigned char sha1
[20];
235 if (gitmodule_sha1_from_commit(commit_sha1
, sha1
, &rev
)) {
236 git_config_from_blob_sha1(submodule_config
, rev
.buf
,
239 strbuf_release(&rev
);
243 * NEEDSWORK: With the addition of different configuration options to determine
244 * if a submodule is of interests, the validity of this function's name comes
245 * into question. Once the dust has settled and more concrete terminology is
246 * decided upon, come up with a more proper name for this function. One
247 * potential candidate could be 'is_submodule_active()'.
249 * Determine if a submodule has been initialized at a given 'path'
251 int is_submodule_initialized(const char *path
)
256 const struct string_list
*sl
;
257 const struct submodule
*module
= submodule_from_path(null_sha1
, path
);
259 /* early return if there isn't a path->module mapping */
263 /* submodule.<name>.active is set */
264 key
= xstrfmt("submodule.%s.active", module
->name
);
265 if (!git_config_get_bool(key
, &ret
)) {
271 /* submodule.active is set */
272 sl
= git_config_get_value_multi("submodule.active");
275 struct argv_array args
= ARGV_ARRAY_INIT
;
276 const struct string_list_item
*item
;
278 for_each_string_list_item(item
, sl
) {
279 argv_array_push(&args
, item
->string
);
282 parse_pathspec(&ps
, 0, 0, NULL
, args
.argv
);
283 ret
= match_pathspec(&ps
, path
, strlen(path
), 0, NULL
, 1);
285 argv_array_clear(&args
);
290 /* fallback to checking if the URL is set */
291 key
= xstrfmt("submodule.%s.url", module
->name
);
292 ret
= !git_config_get_string(key
, &value
);
299 int is_submodule_populated_gently(const char *path
, int *return_error_code
)
302 char *gitdir
= xstrfmt("%s/.git", path
);
304 if (resolve_gitdir_gently(gitdir
, return_error_code
))
311 int parse_submodule_update_strategy(const char *value
,
312 struct submodule_update_strategy
*dst
)
314 free((void*)dst
->command
);
316 if (!strcmp(value
, "none"))
317 dst
->type
= SM_UPDATE_NONE
;
318 else if (!strcmp(value
, "checkout"))
319 dst
->type
= SM_UPDATE_CHECKOUT
;
320 else if (!strcmp(value
, "rebase"))
321 dst
->type
= SM_UPDATE_REBASE
;
322 else if (!strcmp(value
, "merge"))
323 dst
->type
= SM_UPDATE_MERGE
;
324 else if (skip_prefix(value
, "!", &value
)) {
325 dst
->type
= SM_UPDATE_COMMAND
;
326 dst
->command
= xstrdup(value
);
332 const char *submodule_strategy_to_string(const struct submodule_update_strategy
*s
)
334 struct strbuf sb
= STRBUF_INIT
;
336 case SM_UPDATE_CHECKOUT
:
338 case SM_UPDATE_MERGE
:
340 case SM_UPDATE_REBASE
:
344 case SM_UPDATE_UNSPECIFIED
:
346 case SM_UPDATE_COMMAND
:
347 strbuf_addf(&sb
, "!%s", s
->command
);
348 return strbuf_detach(&sb
, NULL
);
353 void handle_ignore_submodules_arg(struct diff_options
*diffopt
,
356 DIFF_OPT_CLR(diffopt
, IGNORE_SUBMODULES
);
357 DIFF_OPT_CLR(diffopt
, IGNORE_UNTRACKED_IN_SUBMODULES
);
358 DIFF_OPT_CLR(diffopt
, IGNORE_DIRTY_SUBMODULES
);
360 if (!strcmp(arg
, "all"))
361 DIFF_OPT_SET(diffopt
, IGNORE_SUBMODULES
);
362 else if (!strcmp(arg
, "untracked"))
363 DIFF_OPT_SET(diffopt
, IGNORE_UNTRACKED_IN_SUBMODULES
);
364 else if (!strcmp(arg
, "dirty"))
365 DIFF_OPT_SET(diffopt
, IGNORE_DIRTY_SUBMODULES
);
366 else if (strcmp(arg
, "none"))
367 die("bad --ignore-submodules argument: %s", arg
);
370 static int prepare_submodule_summary(struct rev_info
*rev
, const char *path
,
371 struct commit
*left
, struct commit
*right
,
372 struct commit_list
*merge_bases
)
374 struct commit_list
*list
;
376 init_revisions(rev
, NULL
);
377 setup_revisions(0, NULL
, rev
, NULL
);
379 rev
->first_parent_only
= 1;
380 left
->object
.flags
|= SYMMETRIC_LEFT
;
381 add_pending_object(rev
, &left
->object
, path
);
382 add_pending_object(rev
, &right
->object
, path
);
383 for (list
= merge_bases
; list
; list
= list
->next
) {
384 list
->item
->object
.flags
|= UNINTERESTING
;
385 add_pending_object(rev
, &list
->item
->object
,
386 oid_to_hex(&list
->item
->object
.oid
));
388 return prepare_revision_walk(rev
);
391 static void print_submodule_summary(struct rev_info
*rev
, FILE *f
,
392 const char *line_prefix
,
393 const char *del
, const char *add
, const char *reset
)
395 static const char format
[] = " %m %s";
396 struct strbuf sb
= STRBUF_INIT
;
397 struct commit
*commit
;
399 while ((commit
= get_revision(rev
))) {
400 struct pretty_print_context ctx
= {0};
401 ctx
.date_mode
= rev
->date_mode
;
402 ctx
.output_encoding
= get_log_output_encoding();
403 strbuf_setlen(&sb
, 0);
404 strbuf_addstr(&sb
, line_prefix
);
405 if (commit
->object
.flags
& SYMMETRIC_LEFT
) {
407 strbuf_addstr(&sb
, del
);
410 strbuf_addstr(&sb
, add
);
411 format_commit_message(commit
, format
, &sb
, &ctx
);
413 strbuf_addstr(&sb
, reset
);
414 strbuf_addch(&sb
, '\n');
415 fprintf(f
, "%s", sb
.buf
);
420 static void prepare_submodule_repo_env_no_git_dir(struct argv_array
*out
)
422 const char * const *var
;
424 for (var
= local_repo_env
; *var
; var
++) {
425 if (strcmp(*var
, CONFIG_DATA_ENVIRONMENT
))
426 argv_array_push(out
, *var
);
430 void prepare_submodule_repo_env(struct argv_array
*out
)
432 prepare_submodule_repo_env_no_git_dir(out
);
433 argv_array_pushf(out
, "%s=%s", GIT_DIR_ENVIRONMENT
,
434 DEFAULT_GIT_DIR_ENVIRONMENT
);
437 /* Helper function to display the submodule header line prior to the full
438 * summary output. If it can locate the submodule objects directory it will
439 * attempt to lookup both the left and right commits and put them into the
440 * left and right pointers.
442 static void show_submodule_header(FILE *f
, const char *path
,
443 const char *line_prefix
,
444 struct object_id
*one
, struct object_id
*two
,
445 unsigned dirty_submodule
, const char *meta
,
447 struct commit
**left
, struct commit
**right
,
448 struct commit_list
**merge_bases
)
450 const char *message
= NULL
;
451 struct strbuf sb
= STRBUF_INIT
;
452 int fast_forward
= 0, fast_backward
= 0;
454 if (dirty_submodule
& DIRTY_SUBMODULE_UNTRACKED
)
455 fprintf(f
, "%sSubmodule %s contains untracked content\n",
457 if (dirty_submodule
& DIRTY_SUBMODULE_MODIFIED
)
458 fprintf(f
, "%sSubmodule %s contains modified content\n",
461 if (is_null_oid(one
))
462 message
= "(new submodule)";
463 else if (is_null_oid(two
))
464 message
= "(submodule deleted)";
466 if (add_submodule_odb(path
)) {
468 message
= "(not initialized)";
473 * Attempt to lookup the commit references, and determine if this is
474 * a fast forward or fast backwards update.
476 *left
= lookup_commit_reference(one
->hash
);
477 *right
= lookup_commit_reference(two
->hash
);
480 * Warn about missing commits in the submodule project, but only if
483 if ((!is_null_oid(one
) && !*left
) ||
484 (!is_null_oid(two
) && !*right
))
485 message
= "(commits not present)";
487 *merge_bases
= get_merge_bases(*left
, *right
);
489 if ((*merge_bases
)->item
== *left
)
491 else if ((*merge_bases
)->item
== *right
)
495 if (!oidcmp(one
, two
)) {
501 strbuf_addf(&sb
, "%s%sSubmodule %s ", line_prefix
, meta
, path
);
502 strbuf_add_unique_abbrev(&sb
, one
->hash
, DEFAULT_ABBREV
);
503 strbuf_addstr(&sb
, (fast_backward
|| fast_forward
) ? ".." : "...");
504 strbuf_add_unique_abbrev(&sb
, two
->hash
, DEFAULT_ABBREV
);
506 strbuf_addf(&sb
, " %s%s\n", message
, reset
);
508 strbuf_addf(&sb
, "%s:%s\n", fast_backward
? " (rewind)" : "", reset
);
509 fwrite(sb
.buf
, sb
.len
, 1, f
);
514 void show_submodule_summary(FILE *f
, const char *path
,
515 const char *line_prefix
,
516 struct object_id
*one
, struct object_id
*two
,
517 unsigned dirty_submodule
, const char *meta
,
518 const char *del
, const char *add
, const char *reset
)
521 struct commit
*left
= NULL
, *right
= NULL
;
522 struct commit_list
*merge_bases
= NULL
;
524 show_submodule_header(f
, path
, line_prefix
, one
, two
, dirty_submodule
,
525 meta
, reset
, &left
, &right
, &merge_bases
);
528 * If we don't have both a left and a right pointer, there is no
529 * reason to try and display a summary. The header line should contain
530 * all the information the user needs.
535 /* Treat revision walker failure the same as missing commits */
536 if (prepare_submodule_summary(&rev
, path
, left
, right
, merge_bases
)) {
537 fprintf(f
, "%s(revision walker failed)\n", line_prefix
);
541 print_submodule_summary(&rev
, f
, line_prefix
, del
, add
, reset
);
545 free_commit_list(merge_bases
);
546 clear_commit_marks(left
, ~0);
547 clear_commit_marks(right
, ~0);
550 void show_submodule_inline_diff(FILE *f
, const char *path
,
551 const char *line_prefix
,
552 struct object_id
*one
, struct object_id
*two
,
553 unsigned dirty_submodule
, const char *meta
,
554 const char *del
, const char *add
, const char *reset
,
555 const struct diff_options
*o
)
557 const struct object_id
*old
= &empty_tree_oid
, *new = &empty_tree_oid
;
558 struct commit
*left
= NULL
, *right
= NULL
;
559 struct commit_list
*merge_bases
= NULL
;
560 struct strbuf submodule_dir
= STRBUF_INIT
;
561 struct child_process cp
= CHILD_PROCESS_INIT
;
563 show_submodule_header(f
, path
, line_prefix
, one
, two
, dirty_submodule
,
564 meta
, reset
, &left
, &right
, &merge_bases
);
566 /* We need a valid left and right commit to display a difference */
567 if (!(left
|| is_null_oid(one
)) ||
568 !(right
|| is_null_oid(two
)))
579 cp
.out
= dup(fileno(f
));
582 /* TODO: other options may need to be passed here. */
583 argv_array_push(&cp
.args
, "diff");
584 argv_array_pushf(&cp
.args
, "--line-prefix=%s", line_prefix
);
585 if (DIFF_OPT_TST(o
, REVERSE_DIFF
)) {
586 argv_array_pushf(&cp
.args
, "--src-prefix=%s%s/",
588 argv_array_pushf(&cp
.args
, "--dst-prefix=%s%s/",
591 argv_array_pushf(&cp
.args
, "--src-prefix=%s%s/",
593 argv_array_pushf(&cp
.args
, "--dst-prefix=%s%s/",
596 argv_array_push(&cp
.args
, oid_to_hex(old
));
598 * If the submodule has modified content, we will diff against the
599 * work tree, under the assumption that the user has asked for the
600 * diff format and wishes to actually see all differences even if they
601 * haven't yet been committed to the submodule yet.
603 if (!(dirty_submodule
& DIRTY_SUBMODULE_MODIFIED
))
604 argv_array_push(&cp
.args
, oid_to_hex(new));
606 prepare_submodule_repo_env(&cp
.env_array
);
607 if (run_command(&cp
))
608 fprintf(f
, "(diff failed)\n");
611 strbuf_release(&submodule_dir
);
613 free_commit_list(merge_bases
);
615 clear_commit_marks(left
, ~0);
617 clear_commit_marks(right
, ~0);
620 void set_config_fetch_recurse_submodules(int value
)
622 config_fetch_recurse_submodules
= value
;
625 int should_update_submodules(void)
627 return config_update_recurse_submodules
== RECURSE_SUBMODULES_ON
;
630 const struct submodule
*submodule_from_ce(const struct cache_entry
*ce
)
632 if (!S_ISGITLINK(ce
->ce_mode
))
635 if (!should_update_submodules())
638 return submodule_from_path(null_sha1
, ce
->name
);
641 static struct oid_array
*submodule_commits(struct string_list
*submodules
,
644 struct string_list_item
*item
;
646 item
= string_list_insert(submodules
, path
);
648 return (struct oid_array
*) item
->util
;
650 /* NEEDSWORK: should we have oid_array_init()? */
651 item
->util
= xcalloc(1, sizeof(struct oid_array
));
652 return (struct oid_array
*) item
->util
;
655 static void collect_changed_submodules_cb(struct diff_queue_struct
*q
,
656 struct diff_options
*options
,
660 struct string_list
*changed
= data
;
662 for (i
= 0; i
< q
->nr
; i
++) {
663 struct diff_filepair
*p
= q
->queue
[i
];
664 struct oid_array
*commits
;
665 if (!S_ISGITLINK(p
->two
->mode
))
668 if (S_ISGITLINK(p
->one
->mode
)) {
670 * NEEDSWORK: We should honor the name configured in
671 * the .gitmodules file of the commit we are examining
672 * here to be able to correctly follow submodules
673 * being moved around.
675 commits
= submodule_commits(changed
, p
->two
->path
);
676 oid_array_append(commits
, &p
->two
->oid
);
678 /* Submodule is new or was moved here */
680 * NEEDSWORK: When the .git directories of submodules
681 * live inside the superprojects .git directory some
682 * day we should fetch new submodules directly into
683 * that location too when config or options request
684 * that so they can be checked out from there.
692 * Collect the paths of submodules in 'changed' which have changed based on
693 * the revisions as specified in 'argv'. Each entry in 'changed' will also
694 * have a corresponding 'struct oid_array' (in the 'util' field) which lists
695 * what the submodule pointers were updated to during the change.
697 static void collect_changed_submodules(struct string_list
*changed
,
698 struct argv_array
*argv
)
701 const struct commit
*commit
;
703 init_revisions(&rev
, NULL
);
704 setup_revisions(argv
->argc
, argv
->argv
, &rev
, NULL
);
705 if (prepare_revision_walk(&rev
))
706 die("revision walk setup failed");
708 while ((commit
= get_revision(&rev
))) {
709 struct rev_info diff_rev
;
711 init_revisions(&diff_rev
, NULL
);
712 diff_rev
.diffopt
.output_format
|= DIFF_FORMAT_CALLBACK
;
713 diff_rev
.diffopt
.format_callback
= collect_changed_submodules_cb
;
714 diff_rev
.diffopt
.format_callback_data
= changed
;
715 diff_tree_combined_merge(commit
, 1, &diff_rev
);
718 reset_revision_walk();
721 static void free_submodules_oids(struct string_list
*submodules
)
723 struct string_list_item
*item
;
724 for_each_string_list_item(item
, submodules
)
725 oid_array_clear((struct oid_array
*) item
->util
);
726 string_list_clear(submodules
, 1);
729 static int has_remote(const char *refname
, const struct object_id
*oid
,
730 int flags
, void *cb_data
)
735 static int append_oid_to_argv(const struct object_id
*oid
, void *data
)
737 struct argv_array
*argv
= data
;
738 argv_array_push(argv
, oid_to_hex(oid
));
742 static int check_has_commit(const struct object_id
*oid
, void *data
)
744 int *has_commit
= data
;
746 if (!lookup_commit_reference(oid
->hash
))
752 static int submodule_has_commits(const char *path
, struct oid_array
*commits
)
757 * Perform a cheap, but incorrect check for the existance of 'commits'.
758 * This is done by adding the submodule's object store to the in-core
759 * object store, and then querying for each commit's existance. If we
760 * do not have the commit object anywhere, there is no chance we have
761 * it in the object store of the correct submodule and have it
762 * reachable from a ref, so we can fail early without spawning rev-list
763 * which is expensive.
765 if (add_submodule_odb(path
))
768 oid_array_for_each_unique(commits
, check_has_commit
, &has_commit
);
772 * Even if the submodule is checked out and the commit is
773 * present, make sure it exists in the submodule's object store
774 * and that it is reachable from a ref.
776 struct child_process cp
= CHILD_PROCESS_INIT
;
777 struct strbuf out
= STRBUF_INIT
;
779 argv_array_pushl(&cp
.args
, "rev-list", "-n", "1", NULL
);
780 oid_array_for_each_unique(commits
, append_oid_to_argv
, &cp
.args
);
781 argv_array_pushl(&cp
.args
, "--not", "--all", NULL
);
783 prepare_submodule_repo_env(&cp
.env_array
);
788 if (capture_command(&cp
, &out
, GIT_MAX_HEXSZ
+ 1) || out
.len
)
791 strbuf_release(&out
);
797 static int submodule_needs_pushing(const char *path
, struct oid_array
*commits
)
799 if (!submodule_has_commits(path
, commits
))
801 * NOTE: We do consider it safe to return "no" here. The
802 * correct answer would be "We do not know" instead of
803 * "No push needed", but it is quite hard to change
804 * the submodule pointer without having the submodule
805 * around. If a user did however change the submodules
806 * without having the submodule around, this indicates
807 * an expert who knows what they are doing or a
808 * maintainer integrating work from other people. In
809 * both cases it should be safe to skip this check.
813 if (for_each_remote_ref_submodule(path
, has_remote
, NULL
) > 0) {
814 struct child_process cp
= CHILD_PROCESS_INIT
;
815 struct strbuf buf
= STRBUF_INIT
;
816 int needs_pushing
= 0;
818 argv_array_push(&cp
.args
, "rev-list");
819 oid_array_for_each_unique(commits
, append_oid_to_argv
, &cp
.args
);
820 argv_array_pushl(&cp
.args
, "--not", "--remotes", "-n", "1" , NULL
);
822 prepare_submodule_repo_env(&cp
.env_array
);
827 if (start_command(&cp
))
828 die("Could not run 'git rev-list <commits> --not --remotes -n 1' command in submodule %s",
830 if (strbuf_read(&buf
, cp
.out
, 41))
834 strbuf_release(&buf
);
835 return needs_pushing
;
841 int find_unpushed_submodules(struct oid_array
*commits
,
842 const char *remotes_name
, struct string_list
*needs_pushing
)
844 struct string_list submodules
= STRING_LIST_INIT_DUP
;
845 struct string_list_item
*submodule
;
846 struct argv_array argv
= ARGV_ARRAY_INIT
;
848 /* argv.argv[0] will be ignored by setup_revisions */
849 argv_array_push(&argv
, "find_unpushed_submodules");
850 oid_array_for_each_unique(commits
, append_oid_to_argv
, &argv
);
851 argv_array_push(&argv
, "--not");
852 argv_array_pushf(&argv
, "--remotes=%s", remotes_name
);
854 collect_changed_submodules(&submodules
, &argv
);
856 for_each_string_list_item(submodule
, &submodules
) {
857 struct oid_array
*commits
= submodule
->util
;
858 const char *path
= submodule
->string
;
860 if (submodule_needs_pushing(path
, commits
))
861 string_list_insert(needs_pushing
, path
);
864 free_submodules_oids(&submodules
);
865 argv_array_clear(&argv
);
867 return needs_pushing
->nr
;
870 static int push_submodule(const char *path
,
871 const struct remote
*remote
,
872 const char **refspec
, int refspec_nr
,
873 const struct string_list
*push_options
,
876 if (add_submodule_odb(path
))
879 if (for_each_remote_ref_submodule(path
, has_remote
, NULL
) > 0) {
880 struct child_process cp
= CHILD_PROCESS_INIT
;
881 argv_array_push(&cp
.args
, "push");
883 argv_array_push(&cp
.args
, "--dry-run");
885 if (push_options
&& push_options
->nr
) {
886 const struct string_list_item
*item
;
887 for_each_string_list_item(item
, push_options
)
888 argv_array_pushf(&cp
.args
, "--push-option=%s",
892 if (remote
->origin
!= REMOTE_UNCONFIGURED
) {
894 argv_array_push(&cp
.args
, remote
->name
);
895 for (i
= 0; i
< refspec_nr
; i
++)
896 argv_array_push(&cp
.args
, refspec
[i
]);
899 prepare_submodule_repo_env(&cp
.env_array
);
903 if (run_command(&cp
))
912 * Perform a check in the submodule to see if the remote and refspec work.
913 * Die if the submodule can't be pushed.
915 static void submodule_push_check(const char *path
, const struct remote
*remote
,
916 const char **refspec
, int refspec_nr
)
918 struct child_process cp
= CHILD_PROCESS_INIT
;
921 argv_array_push(&cp
.args
, "submodule--helper");
922 argv_array_push(&cp
.args
, "push-check");
923 argv_array_push(&cp
.args
, remote
->name
);
925 for (i
= 0; i
< refspec_nr
; i
++)
926 argv_array_push(&cp
.args
, refspec
[i
]);
928 prepare_submodule_repo_env(&cp
.env_array
);
935 * Simply indicate if 'submodule--helper push-check' failed.
936 * More detailed error information will be provided by the
939 if (run_command(&cp
))
940 die("process for submodule '%s' failed", path
);
943 int push_unpushed_submodules(struct oid_array
*commits
,
944 const struct remote
*remote
,
945 const char **refspec
, int refspec_nr
,
946 const struct string_list
*push_options
,
950 struct string_list needs_pushing
= STRING_LIST_INIT_DUP
;
952 if (!find_unpushed_submodules(commits
, remote
->name
, &needs_pushing
))
956 * Verify that the remote and refspec can be propagated to all
957 * submodules. This check can be skipped if the remote and refspec
958 * won't be propagated due to the remote being unconfigured (e.g. a URL
959 * instead of a remote name).
961 if (remote
->origin
!= REMOTE_UNCONFIGURED
)
962 for (i
= 0; i
< needs_pushing
.nr
; i
++)
963 submodule_push_check(needs_pushing
.items
[i
].string
,
964 remote
, refspec
, refspec_nr
);
966 /* Actually push the submodules */
967 for (i
= 0; i
< needs_pushing
.nr
; i
++) {
968 const char *path
= needs_pushing
.items
[i
].string
;
969 fprintf(stderr
, "Pushing submodule '%s'\n", path
);
970 if (!push_submodule(path
, remote
, refspec
, refspec_nr
,
971 push_options
, dry_run
)) {
972 fprintf(stderr
, "Unable to push submodule '%s'\n", path
);
977 string_list_clear(&needs_pushing
, 0);
982 static int append_oid_to_array(const char *ref
, const struct object_id
*oid
,
983 int flags
, void *data
)
985 struct oid_array
*array
= data
;
986 oid_array_append(array
, oid
);
990 void check_for_new_submodule_commits(struct object_id
*oid
)
992 if (!initialized_fetch_ref_tips
) {
993 for_each_ref(append_oid_to_array
, &ref_tips_before_fetch
);
994 initialized_fetch_ref_tips
= 1;
997 oid_array_append(&ref_tips_after_fetch
, oid
);
1000 static void calculate_changed_submodule_paths(void)
1002 struct argv_array argv
= ARGV_ARRAY_INIT
;
1003 struct string_list changed_submodules
= STRING_LIST_INIT_DUP
;
1004 const struct string_list_item
*item
;
1006 /* No need to check if there are no submodules configured */
1007 if (!submodule_from_path(NULL
, NULL
))
1010 argv_array_push(&argv
, "--"); /* argv[0] program name */
1011 oid_array_for_each_unique(&ref_tips_after_fetch
,
1012 append_oid_to_argv
, &argv
);
1013 argv_array_push(&argv
, "--not");
1014 oid_array_for_each_unique(&ref_tips_before_fetch
,
1015 append_oid_to_argv
, &argv
);
1018 * Collect all submodules (whether checked out or not) for which new
1019 * commits have been recorded upstream in "changed_submodule_paths".
1021 collect_changed_submodules(&changed_submodules
, &argv
);
1023 for_each_string_list_item(item
, &changed_submodules
) {
1024 struct oid_array
*commits
= item
->util
;
1025 const char *path
= item
->string
;
1027 if (!submodule_has_commits(path
, commits
))
1028 string_list_append(&changed_submodule_paths
, path
);
1031 free_submodules_oids(&changed_submodules
);
1032 argv_array_clear(&argv
);
1033 oid_array_clear(&ref_tips_before_fetch
);
1034 oid_array_clear(&ref_tips_after_fetch
);
1035 initialized_fetch_ref_tips
= 0;
1038 struct submodule_parallel_fetch
{
1040 struct argv_array args
;
1041 const char *work_tree
;
1043 int command_line_option
;
1047 #define SPF_INIT {0, ARGV_ARRAY_INIT, NULL, NULL, 0, 0, 0}
1049 static int get_next_submodule(struct child_process
*cp
,
1050 struct strbuf
*err
, void *data
, void **task_cb
)
1053 struct submodule_parallel_fetch
*spf
= data
;
1055 for (; spf
->count
< active_nr
; spf
->count
++) {
1056 struct strbuf submodule_path
= STRBUF_INIT
;
1057 struct strbuf submodule_git_dir
= STRBUF_INIT
;
1058 struct strbuf submodule_prefix
= STRBUF_INIT
;
1059 const struct cache_entry
*ce
= active_cache
[spf
->count
];
1060 const char *git_dir
, *default_argv
;
1061 const struct submodule
*submodule
;
1063 if (!S_ISGITLINK(ce
->ce_mode
))
1066 submodule
= submodule_from_path(null_sha1
, ce
->name
);
1068 submodule
= submodule_from_name(null_sha1
, ce
->name
);
1070 default_argv
= "yes";
1071 if (spf
->command_line_option
== RECURSE_SUBMODULES_DEFAULT
) {
1073 submodule
->fetch_recurse
!=
1074 RECURSE_SUBMODULES_NONE
) {
1075 if (submodule
->fetch_recurse
==
1076 RECURSE_SUBMODULES_OFF
)
1078 if (submodule
->fetch_recurse
==
1079 RECURSE_SUBMODULES_ON_DEMAND
) {
1080 if (!unsorted_string_list_lookup(&changed_submodule_paths
, ce
->name
))
1082 default_argv
= "on-demand";
1085 if ((config_fetch_recurse_submodules
== RECURSE_SUBMODULES_OFF
) ||
1086 gitmodules_is_unmerged
)
1088 if (config_fetch_recurse_submodules
== RECURSE_SUBMODULES_ON_DEMAND
) {
1089 if (!unsorted_string_list_lookup(&changed_submodule_paths
, ce
->name
))
1091 default_argv
= "on-demand";
1094 } else if (spf
->command_line_option
== RECURSE_SUBMODULES_ON_DEMAND
) {
1095 if (!unsorted_string_list_lookup(&changed_submodule_paths
, ce
->name
))
1097 default_argv
= "on-demand";
1100 strbuf_addf(&submodule_path
, "%s/%s", spf
->work_tree
, ce
->name
);
1101 strbuf_addf(&submodule_git_dir
, "%s/.git", submodule_path
.buf
);
1102 strbuf_addf(&submodule_prefix
, "%s%s/", spf
->prefix
, ce
->name
);
1103 git_dir
= read_gitfile(submodule_git_dir
.buf
);
1105 git_dir
= submodule_git_dir
.buf
;
1106 if (is_directory(git_dir
)) {
1107 child_process_init(cp
);
1108 cp
->dir
= strbuf_detach(&submodule_path
, NULL
);
1109 prepare_submodule_repo_env(&cp
->env_array
);
1112 strbuf_addf(err
, "Fetching submodule %s%s\n",
1113 spf
->prefix
, ce
->name
);
1114 argv_array_init(&cp
->args
);
1115 argv_array_pushv(&cp
->args
, spf
->args
.argv
);
1116 argv_array_push(&cp
->args
, default_argv
);
1117 argv_array_push(&cp
->args
, "--submodule-prefix");
1118 argv_array_push(&cp
->args
, submodule_prefix
.buf
);
1121 strbuf_release(&submodule_path
);
1122 strbuf_release(&submodule_git_dir
);
1123 strbuf_release(&submodule_prefix
);
1132 static int fetch_start_failure(struct strbuf
*err
,
1133 void *cb
, void *task_cb
)
1135 struct submodule_parallel_fetch
*spf
= cb
;
1142 static int fetch_finish(int retvalue
, struct strbuf
*err
,
1143 void *cb
, void *task_cb
)
1145 struct submodule_parallel_fetch
*spf
= cb
;
1153 int fetch_populated_submodules(const struct argv_array
*options
,
1154 const char *prefix
, int command_line_option
,
1155 int quiet
, int max_parallel_jobs
)
1158 struct submodule_parallel_fetch spf
= SPF_INIT
;
1160 spf
.work_tree
= get_git_work_tree();
1161 spf
.command_line_option
= command_line_option
;
1163 spf
.prefix
= prefix
;
1168 if (read_cache() < 0)
1169 die("index file corrupt");
1171 argv_array_push(&spf
.args
, "fetch");
1172 for (i
= 0; i
< options
->argc
; i
++)
1173 argv_array_push(&spf
.args
, options
->argv
[i
]);
1174 argv_array_push(&spf
.args
, "--recurse-submodules-default");
1175 /* default value, "--submodule-prefix" and its value are added later */
1177 if (max_parallel_jobs
< 0)
1178 max_parallel_jobs
= parallel_jobs
;
1180 calculate_changed_submodule_paths();
1181 run_processes_parallel(max_parallel_jobs
,
1183 fetch_start_failure
,
1187 argv_array_clear(&spf
.args
);
1189 string_list_clear(&changed_submodule_paths
, 1);
1193 unsigned is_submodule_modified(const char *path
, int ignore_untracked
)
1195 struct child_process cp
= CHILD_PROCESS_INIT
;
1196 struct strbuf buf
= STRBUF_INIT
;
1198 unsigned dirty_submodule
= 0;
1199 const char *git_dir
;
1200 int ignore_cp_exit_code
= 0;
1202 strbuf_addf(&buf
, "%s/.git", path
);
1203 git_dir
= read_gitfile(buf
.buf
);
1206 if (!is_git_directory(git_dir
)) {
1207 if (is_directory(git_dir
))
1208 die(_("'%s' not recognized as a git repository"), git_dir
);
1209 strbuf_release(&buf
);
1210 /* The submodule is not checked out, so it is not modified */
1215 argv_array_pushl(&cp
.args
, "status", "--porcelain=2", NULL
);
1216 if (ignore_untracked
)
1217 argv_array_push(&cp
.args
, "-uno");
1219 prepare_submodule_repo_env(&cp
.env_array
);
1224 if (start_command(&cp
))
1225 die("Could not run 'git status --porcelain=2' in submodule %s", path
);
1227 fp
= xfdopen(cp
.out
, "r");
1228 while (strbuf_getwholeline(&buf
, fp
, '\n') != EOF
) {
1229 /* regular untracked files */
1230 if (buf
.buf
[0] == '?')
1231 dirty_submodule
|= DIRTY_SUBMODULE_UNTRACKED
;
1233 if (buf
.buf
[0] == 'u' ||
1234 buf
.buf
[0] == '1' ||
1235 buf
.buf
[0] == '2') {
1236 /* T = line type, XY = status, SSSS = submodule state */
1237 if (buf
.len
< strlen("T XY SSSS"))
1238 die("BUG: invalid status --porcelain=2 line %s",
1241 if (buf
.buf
[5] == 'S' && buf
.buf
[8] == 'U')
1242 /* nested untracked file */
1243 dirty_submodule
|= DIRTY_SUBMODULE_UNTRACKED
;
1245 if (buf
.buf
[0] == 'u' ||
1246 buf
.buf
[0] == '2' ||
1247 memcmp(buf
.buf
+ 5, "S..U", 4))
1249 dirty_submodule
|= DIRTY_SUBMODULE_MODIFIED
;
1252 if ((dirty_submodule
& DIRTY_SUBMODULE_MODIFIED
) &&
1253 ((dirty_submodule
& DIRTY_SUBMODULE_UNTRACKED
) ||
1254 ignore_untracked
)) {
1256 * We're not interested in any further information from
1257 * the child any more, neither output nor its exit code.
1259 ignore_cp_exit_code
= 1;
1265 if (finish_command(&cp
) && !ignore_cp_exit_code
)
1266 die("'git status --porcelain=2' failed in submodule %s", path
);
1268 strbuf_release(&buf
);
1269 return dirty_submodule
;
1272 int submodule_uses_gitfile(const char *path
)
1274 struct child_process cp
= CHILD_PROCESS_INIT
;
1275 const char *argv
[] = {
1283 struct strbuf buf
= STRBUF_INIT
;
1284 const char *git_dir
;
1286 strbuf_addf(&buf
, "%s/.git", path
);
1287 git_dir
= read_gitfile(buf
.buf
);
1289 strbuf_release(&buf
);
1292 strbuf_release(&buf
);
1294 /* Now test that all nested submodules use a gitfile too */
1296 prepare_submodule_repo_env(&cp
.env_array
);
1302 if (run_command(&cp
))
1309 * Check if it is a bad idea to remove a submodule, i.e. if we'd lose data
1312 * Return 1 if we'd lose data, return 0 if the removal is fine,
1313 * and negative values for errors.
1315 int bad_to_remove_submodule(const char *path
, unsigned flags
)
1318 struct child_process cp
= CHILD_PROCESS_INIT
;
1319 struct strbuf buf
= STRBUF_INIT
;
1322 if (!file_exists(path
) || is_empty_dir(path
))
1325 if (!submodule_uses_gitfile(path
))
1328 argv_array_pushl(&cp
.args
, "status", "--porcelain",
1329 "--ignore-submodules=none", NULL
);
1331 if (flags
& SUBMODULE_REMOVAL_IGNORE_UNTRACKED
)
1332 argv_array_push(&cp
.args
, "-uno");
1334 argv_array_push(&cp
.args
, "-uall");
1336 if (!(flags
& SUBMODULE_REMOVAL_IGNORE_IGNORED_UNTRACKED
))
1337 argv_array_push(&cp
.args
, "--ignored");
1339 prepare_submodule_repo_env(&cp
.env_array
);
1344 if (start_command(&cp
)) {
1345 if (flags
& SUBMODULE_REMOVAL_DIE_ON_ERROR
)
1346 die(_("could not start 'git status' in submodule '%s'"),
1352 len
= strbuf_read(&buf
, cp
.out
, 1024);
1357 if (finish_command(&cp
)) {
1358 if (flags
& SUBMODULE_REMOVAL_DIE_ON_ERROR
)
1359 die(_("could not run 'git status' in submodule '%s'"),
1364 strbuf_release(&buf
);
1368 static const char *get_super_prefix_or_empty(void)
1370 const char *s
= get_super_prefix();
1376 static int submodule_has_dirty_index(const struct submodule
*sub
)
1378 struct child_process cp
= CHILD_PROCESS_INIT
;
1380 prepare_submodule_repo_env_no_git_dir(&cp
.env_array
);
1383 argv_array_pushl(&cp
.args
, "diff-index", "--quiet",
1384 "--cached", "HEAD", NULL
);
1388 if (start_command(&cp
))
1389 die("could not recurse into submodule '%s'", sub
->path
);
1391 return finish_command(&cp
);
1394 static void submodule_reset_index(const char *path
)
1396 struct child_process cp
= CHILD_PROCESS_INIT
;
1397 prepare_submodule_repo_env_no_git_dir(&cp
.env_array
);
1403 argv_array_pushf(&cp
.args
, "--super-prefix=%s%s/",
1404 get_super_prefix_or_empty(), path
);
1405 argv_array_pushl(&cp
.args
, "read-tree", "-u", "--reset", NULL
);
1407 argv_array_push(&cp
.args
, EMPTY_TREE_SHA1_HEX
);
1409 if (run_command(&cp
))
1410 die("could not reset submodule index");
1414 * Moves a submodule at a given path from a given head to another new head.
1415 * For edge cases (a submodule coming into existence or removing a submodule)
1416 * pass NULL for old or new respectively.
1418 int submodule_move_head(const char *path
,
1424 struct child_process cp
= CHILD_PROCESS_INIT
;
1425 const struct submodule
*sub
;
1426 int *error_code_ptr
, error_code
;
1428 if (!is_submodule_initialized(path
))
1431 if (flags
& SUBMODULE_MOVE_HEAD_FORCE
)
1433 * Pass non NULL pointer to is_submodule_populated_gently
1434 * to prevent die()-ing. We'll use connect_work_tree_and_git_dir
1435 * to fixup the submodule in the force case later.
1437 error_code_ptr
= &error_code
;
1439 error_code_ptr
= NULL
;
1441 if (old
&& !is_submodule_populated_gently(path
, error_code_ptr
))
1444 sub
= submodule_from_path(null_sha1
, path
);
1447 die("BUG: could not get submodule information for '%s'", path
);
1449 if (old
&& !(flags
& SUBMODULE_MOVE_HEAD_FORCE
)) {
1450 /* Check if the submodule has a dirty index. */
1451 if (submodule_has_dirty_index(sub
))
1452 return error(_("submodule '%s' has dirty index"), path
);
1455 if (!(flags
& SUBMODULE_MOVE_HEAD_DRY_RUN
)) {
1457 if (!submodule_uses_gitfile(path
))
1458 absorb_git_dir_into_superproject("", path
,
1459 ABSORB_GITDIR_RECURSE_SUBMODULES
);
1461 char *gitdir
= xstrfmt("%s/modules/%s",
1462 get_git_common_dir(), sub
->name
);
1463 connect_work_tree_and_git_dir(path
, gitdir
);
1466 /* make sure the index is clean as well */
1467 submodule_reset_index(path
);
1470 if (old
&& (flags
& SUBMODULE_MOVE_HEAD_FORCE
)) {
1471 char *gitdir
= xstrfmt("%s/modules/%s",
1472 get_git_common_dir(), sub
->name
);
1473 connect_work_tree_and_git_dir(path
, gitdir
);
1478 prepare_submodule_repo_env_no_git_dir(&cp
.env_array
);
1484 argv_array_pushf(&cp
.args
, "--super-prefix=%s%s/",
1485 get_super_prefix_or_empty(), path
);
1486 argv_array_pushl(&cp
.args
, "read-tree", NULL
);
1488 if (flags
& SUBMODULE_MOVE_HEAD_DRY_RUN
)
1489 argv_array_push(&cp
.args
, "-n");
1491 argv_array_push(&cp
.args
, "-u");
1493 if (flags
& SUBMODULE_MOVE_HEAD_FORCE
)
1494 argv_array_push(&cp
.args
, "--reset");
1496 argv_array_push(&cp
.args
, "-m");
1498 argv_array_push(&cp
.args
, old
? old
: EMPTY_TREE_SHA1_HEX
);
1499 argv_array_push(&cp
.args
, new ? new : EMPTY_TREE_SHA1_HEX
);
1501 if (run_command(&cp
)) {
1506 if (!(flags
& SUBMODULE_MOVE_HEAD_DRY_RUN
)) {
1508 struct child_process cp1
= CHILD_PROCESS_INIT
;
1509 /* also set the HEAD accordingly */
1514 argv_array_pushl(&cp1
.args
, "update-ref", "HEAD", new, NULL
);
1516 if (run_command(&cp1
)) {
1521 struct strbuf sb
= STRBUF_INIT
;
1523 strbuf_addf(&sb
, "%s/.git", path
);
1524 unlink_or_warn(sb
.buf
);
1525 strbuf_release(&sb
);
1527 if (is_empty_dir(path
))
1528 rmdir_or_warn(path
);
1535 static int find_first_merges(struct object_array
*result
, const char *path
,
1536 struct commit
*a
, struct commit
*b
)
1539 struct object_array merges
= OBJECT_ARRAY_INIT
;
1540 struct commit
*commit
;
1541 int contains_another
;
1543 char merged_revision
[42];
1544 const char *rev_args
[] = { "rev-list", "--merges", "--ancestry-path",
1545 "--all", merged_revision
, NULL
};
1546 struct rev_info revs
;
1547 struct setup_revision_opt rev_opts
;
1549 memset(result
, 0, sizeof(struct object_array
));
1550 memset(&rev_opts
, 0, sizeof(rev_opts
));
1552 /* get all revisions that merge commit a */
1553 xsnprintf(merged_revision
, sizeof(merged_revision
), "^%s",
1554 oid_to_hex(&a
->object
.oid
));
1555 init_revisions(&revs
, NULL
);
1556 rev_opts
.submodule
= path
;
1557 setup_revisions(ARRAY_SIZE(rev_args
)-1, rev_args
, &revs
, &rev_opts
);
1559 /* save all revisions from the above list that contain b */
1560 if (prepare_revision_walk(&revs
))
1561 die("revision walk setup failed");
1562 while ((commit
= get_revision(&revs
)) != NULL
) {
1563 struct object
*o
= &(commit
->object
);
1564 if (in_merge_bases(b
, commit
))
1565 add_object_array(o
, NULL
, &merges
);
1567 reset_revision_walk();
1569 /* Now we've got all merges that contain a and b. Prune all
1570 * merges that contain another found merge and save them in
1573 for (i
= 0; i
< merges
.nr
; i
++) {
1574 struct commit
*m1
= (struct commit
*) merges
.objects
[i
].item
;
1576 contains_another
= 0;
1577 for (j
= 0; j
< merges
.nr
; j
++) {
1578 struct commit
*m2
= (struct commit
*) merges
.objects
[j
].item
;
1579 if (i
!= j
&& in_merge_bases(m2
, m1
)) {
1580 contains_another
= 1;
1585 if (!contains_another
)
1586 add_object_array(merges
.objects
[i
].item
, NULL
, result
);
1589 free(merges
.objects
);
1593 static void print_commit(struct commit
*commit
)
1595 struct strbuf sb
= STRBUF_INIT
;
1596 struct pretty_print_context ctx
= {0};
1597 ctx
.date_mode
.type
= DATE_NORMAL
;
1598 format_commit_message(commit
, " %h: %m %s", &sb
, &ctx
);
1599 fprintf(stderr
, "%s\n", sb
.buf
);
1600 strbuf_release(&sb
);
1603 #define MERGE_WARNING(path, msg) \
1604 warning("Failed to merge submodule %s (%s)", path, msg);
1606 int merge_submodule(unsigned char result
[20], const char *path
,
1607 const unsigned char base
[20], const unsigned char a
[20],
1608 const unsigned char b
[20], int search
)
1610 struct commit
*commit_base
, *commit_a
, *commit_b
;
1612 struct object_array merges
;
1616 /* store a in result in case we fail */
1619 /* we can not handle deletion conflicts */
1620 if (is_null_sha1(base
))
1622 if (is_null_sha1(a
))
1624 if (is_null_sha1(b
))
1627 if (add_submodule_odb(path
)) {
1628 MERGE_WARNING(path
, "not checked out");
1632 if (!(commit_base
= lookup_commit_reference(base
)) ||
1633 !(commit_a
= lookup_commit_reference(a
)) ||
1634 !(commit_b
= lookup_commit_reference(b
))) {
1635 MERGE_WARNING(path
, "commits not present");
1639 /* check whether both changes are forward */
1640 if (!in_merge_bases(commit_base
, commit_a
) ||
1641 !in_merge_bases(commit_base
, commit_b
)) {
1642 MERGE_WARNING(path
, "commits don't follow merge-base");
1646 /* Case #1: a is contained in b or vice versa */
1647 if (in_merge_bases(commit_a
, commit_b
)) {
1651 if (in_merge_bases(commit_b
, commit_a
)) {
1657 * Case #2: There are one or more merges that contain a and b in
1658 * the submodule. If there is only one, then present it as a
1659 * suggestion to the user, but leave it marked unmerged so the
1660 * user needs to confirm the resolution.
1663 /* Skip the search if makes no sense to the calling context. */
1667 /* find commit which merges them */
1668 parent_count
= find_first_merges(&merges
, path
, commit_a
, commit_b
);
1669 switch (parent_count
) {
1671 MERGE_WARNING(path
, "merge following commits not found");
1675 MERGE_WARNING(path
, "not fast-forward");
1676 fprintf(stderr
, "Found a possible merge resolution "
1677 "for the submodule:\n");
1678 print_commit((struct commit
*) merges
.objects
[0].item
);
1680 "If this is correct simply add it to the index "
1683 " git update-index --cacheinfo 160000 %s \"%s\"\n\n"
1684 "which will accept this suggestion.\n",
1685 oid_to_hex(&merges
.objects
[0].item
->oid
), path
);
1689 MERGE_WARNING(path
, "multiple merges found");
1690 for (i
= 0; i
< merges
.nr
; i
++)
1691 print_commit((struct commit
*) merges
.objects
[i
].item
);
1694 free(merges
.objects
);
1698 int parallel_submodules(void)
1700 return parallel_jobs
;
1704 * Embeds a single submodules git directory into the superprojects git dir,
1707 static void relocate_single_git_dir_into_superproject(const char *prefix
,
1710 char *old_git_dir
= NULL
, *real_old_git_dir
= NULL
, *real_new_git_dir
= NULL
;
1711 const char *new_git_dir
;
1712 const struct submodule
*sub
;
1714 if (submodule_uses_worktrees(path
))
1715 die(_("relocate_gitdir for submodule '%s' with "
1716 "more than one worktree not supported"), path
);
1718 old_git_dir
= xstrfmt("%s/.git", path
);
1719 if (read_gitfile(old_git_dir
))
1720 /* If it is an actual gitfile, it doesn't need migration. */
1723 real_old_git_dir
= real_pathdup(old_git_dir
, 1);
1725 sub
= submodule_from_path(null_sha1
, path
);
1727 die(_("could not lookup name for submodule '%s'"), path
);
1729 new_git_dir
= git_path("modules/%s", sub
->name
);
1730 if (safe_create_leading_directories_const(new_git_dir
) < 0)
1731 die(_("could not create directory '%s'"), new_git_dir
);
1732 real_new_git_dir
= real_pathdup(new_git_dir
, 1);
1734 fprintf(stderr
, _("Migrating git directory of '%s%s' from\n'%s' to\n'%s'\n"),
1735 get_super_prefix_or_empty(), path
,
1736 real_old_git_dir
, real_new_git_dir
);
1738 relocate_gitdir(path
, real_old_git_dir
, real_new_git_dir
);
1741 free(real_old_git_dir
);
1742 free(real_new_git_dir
);
1746 * Migrate the git directory of the submodule given by path from
1747 * having its git directory within the working tree to the git dir nested
1748 * in its superprojects git dir under modules/.
1750 void absorb_git_dir_into_superproject(const char *prefix
,
1755 const char *sub_git_dir
;
1756 struct strbuf gitdir
= STRBUF_INIT
;
1757 strbuf_addf(&gitdir
, "%s/.git", path
);
1758 sub_git_dir
= resolve_gitdir_gently(gitdir
.buf
, &err_code
);
1760 /* Not populated? */
1762 const struct submodule
*sub
;
1764 if (err_code
== READ_GITFILE_ERR_STAT_FAILED
) {
1765 /* unpopulated as expected */
1766 strbuf_release(&gitdir
);
1770 if (err_code
!= READ_GITFILE_ERR_NOT_A_REPO
)
1771 /* We don't know what broke here. */
1772 read_gitfile_error_die(err_code
, path
, NULL
);
1775 * Maybe populated, but no git directory was found?
1776 * This can happen if the superproject is a submodule
1777 * itself and was just absorbed. The absorption of the
1778 * superproject did not rewrite the git file links yet,
1781 sub
= submodule_from_path(null_sha1
, path
);
1783 die(_("could not lookup name for submodule '%s'"), path
);
1784 connect_work_tree_and_git_dir(path
,
1785 git_path("modules/%s", sub
->name
));
1787 /* Is it already absorbed into the superprojects git dir? */
1788 char *real_sub_git_dir
= real_pathdup(sub_git_dir
, 1);
1789 char *real_common_git_dir
= real_pathdup(get_git_common_dir(), 1);
1791 if (!starts_with(real_sub_git_dir
, real_common_git_dir
))
1792 relocate_single_git_dir_into_superproject(prefix
, path
);
1794 free(real_sub_git_dir
);
1795 free(real_common_git_dir
);
1797 strbuf_release(&gitdir
);
1799 if (flags
& ABSORB_GITDIR_RECURSE_SUBMODULES
) {
1800 struct child_process cp
= CHILD_PROCESS_INIT
;
1801 struct strbuf sb
= STRBUF_INIT
;
1803 if (flags
& ~ABSORB_GITDIR_RECURSE_SUBMODULES
)
1804 die("BUG: we don't know how to pass the flags down?");
1806 strbuf_addstr(&sb
, get_super_prefix_or_empty());
1807 strbuf_addstr(&sb
, path
);
1808 strbuf_addch(&sb
, '/');
1813 argv_array_pushl(&cp
.args
, "--super-prefix", sb
.buf
,
1814 "submodule--helper",
1815 "absorb-git-dirs", NULL
);
1816 prepare_submodule_repo_env(&cp
.env_array
);
1817 if (run_command(&cp
))
1818 die(_("could not recurse into submodule '%s'"), path
);
1820 strbuf_release(&sb
);
1824 const char *get_superproject_working_tree(void)
1826 struct child_process cp
= CHILD_PROCESS_INIT
;
1827 struct strbuf sb
= STRBUF_INIT
;
1828 const char *one_up
= real_path_if_valid("../");
1829 const char *cwd
= xgetcwd();
1830 const char *ret
= NULL
;
1831 const char *subpath
;
1835 if (!is_inside_work_tree())
1838 * We might have a superproject, but it is harder
1846 subpath
= relative_path(cwd
, one_up
, &sb
);
1848 prepare_submodule_repo_env(&cp
.env_array
);
1849 argv_array_pop(&cp
.env_array
);
1851 argv_array_pushl(&cp
.args
, "--literal-pathspecs", "-C", "..",
1852 "ls-files", "-z", "--stage", "--full-name", "--",
1861 if (start_command(&cp
))
1862 die(_("could not start ls-files in .."));
1864 len
= strbuf_read(&sb
, cp
.out
, PATH_MAX
);
1867 if (starts_with(sb
.buf
, "160000")) {
1869 int cwd_len
= strlen(cwd
);
1870 char *super_sub
, *super_wt
;
1873 * There is a superproject having this repo as a submodule.
1874 * The format is <mode> SP <hash> SP <stage> TAB <full name> \0,
1875 * We're only interested in the name after the tab.
1877 super_sub
= strchr(sb
.buf
, '\t') + 1;
1878 super_sub_len
= sb
.buf
+ sb
.len
- super_sub
- 1;
1880 if (super_sub_len
> cwd_len
||
1881 strcmp(&cwd
[cwd_len
- super_sub_len
], super_sub
))
1882 die (_("BUG: returned path string doesn't match cwd?"));
1884 super_wt
= xstrdup(cwd
);
1885 super_wt
[cwd_len
- super_sub_len
] = '\0';
1887 ret
= real_path(super_wt
);
1890 strbuf_release(&sb
);
1892 code
= finish_command(&cp
);
1895 /* '../' is not a git repository */
1897 if (code
== 0 && len
== 0)
1898 /* There is an unrelated git repository at '../' */
1901 die(_("ls-tree returned unexpected return code %d"), code
);
1906 int submodule_to_gitdir(struct strbuf
*buf
, const char *submodule
)
1908 const struct submodule
*sub
;
1909 const char *git_dir
;
1913 strbuf_addstr(buf
, submodule
);
1914 strbuf_complete(buf
, '/');
1915 strbuf_addstr(buf
, ".git");
1917 git_dir
= read_gitfile(buf
->buf
);
1920 strbuf_addstr(buf
, git_dir
);
1922 if (!is_git_directory(buf
->buf
)) {
1923 gitmodules_config();
1924 sub
= submodule_from_path(null_sha1
, submodule
);
1930 strbuf_git_path(buf
, "%s/%s", "modules", sub
->name
);