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_DEFAULT
;
22 static int parallel_jobs
= 1;
23 static struct string_list changed_submodule_paths
= STRING_LIST_INIT_NODUP
;
24 static int initialized_fetch_ref_tips
;
25 static struct sha1_array ref_tips_before_fetch
;
26 static struct sha1_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 void gitmodules_config(void)
174 const char *work_tree
= get_git_work_tree();
176 struct strbuf gitmodules_path
= STRBUF_INIT
;
178 strbuf_addstr(&gitmodules_path
, work_tree
);
179 strbuf_addstr(&gitmodules_path
, "/.gitmodules");
180 if (read_cache() < 0)
181 die("index file corrupt");
182 pos
= cache_name_pos(".gitmodules", 11);
183 if (pos
< 0) { /* .gitmodules not found or isn't merged */
185 if (active_nr
> pos
) { /* there is a .gitmodules */
186 const struct cache_entry
*ce
= active_cache
[pos
];
187 if (ce_namelen(ce
) == 11 &&
188 !memcmp(ce
->name
, ".gitmodules", 11))
189 gitmodules_is_unmerged
= 1;
191 } else if (pos
< active_nr
) {
193 if (lstat(".gitmodules", &st
) == 0 &&
194 ce_match_stat(active_cache
[pos
], &st
, 0) & DATA_CHANGED
)
195 gitmodules_is_modified
= 1;
198 if (!gitmodules_is_unmerged
)
199 git_config_from_file(submodule_config
, gitmodules_path
.buf
, NULL
);
200 strbuf_release(&gitmodules_path
);
204 void gitmodules_config_sha1(const unsigned char *commit_sha1
)
206 struct strbuf rev
= STRBUF_INIT
;
207 unsigned char sha1
[20];
209 if (gitmodule_sha1_from_commit(commit_sha1
, sha1
, &rev
)) {
210 git_config_from_blob_sha1(submodule_config
, rev
.buf
,
213 strbuf_release(&rev
);
217 * NEEDSWORK: With the addition of different configuration options to determine
218 * if a submodule is of interests, the validity of this function's name comes
219 * into question. Once the dust has settled and more concrete terminology is
220 * decided upon, come up with a more proper name for this function. One
221 * potential candidate could be 'is_submodule_active()'.
223 * Determine if a submodule has been initialized at a given 'path'
225 int is_submodule_initialized(const char *path
)
230 const struct string_list
*sl
;
231 const struct submodule
*module
= submodule_from_path(null_sha1
, path
);
233 /* early return if there isn't a path->module mapping */
237 /* submodule.<name>.active is set */
238 key
= xstrfmt("submodule.%s.active", module
->name
);
239 if (!git_config_get_bool(key
, &ret
)) {
245 /* submodule.active is set */
246 sl
= git_config_get_value_multi("submodule.active");
249 struct argv_array args
= ARGV_ARRAY_INIT
;
250 const struct string_list_item
*item
;
252 for_each_string_list_item(item
, sl
) {
253 argv_array_push(&args
, item
->string
);
256 parse_pathspec(&ps
, 0, 0, NULL
, args
.argv
);
257 ret
= match_pathspec(&ps
, path
, strlen(path
), 0, NULL
, 1);
259 argv_array_clear(&args
);
264 /* fallback to checking if the URL is set */
265 key
= xstrfmt("submodule.%s.url", module
->name
);
266 ret
= !git_config_get_string(key
, &value
);
273 int is_submodule_populated_gently(const char *path
, int *return_error_code
)
276 char *gitdir
= xstrfmt("%s/.git", path
);
278 if (resolve_gitdir_gently(gitdir
, return_error_code
))
285 int parse_submodule_update_strategy(const char *value
,
286 struct submodule_update_strategy
*dst
)
288 free((void*)dst
->command
);
290 if (!strcmp(value
, "none"))
291 dst
->type
= SM_UPDATE_NONE
;
292 else if (!strcmp(value
, "checkout"))
293 dst
->type
= SM_UPDATE_CHECKOUT
;
294 else if (!strcmp(value
, "rebase"))
295 dst
->type
= SM_UPDATE_REBASE
;
296 else if (!strcmp(value
, "merge"))
297 dst
->type
= SM_UPDATE_MERGE
;
298 else if (skip_prefix(value
, "!", &value
)) {
299 dst
->type
= SM_UPDATE_COMMAND
;
300 dst
->command
= xstrdup(value
);
306 const char *submodule_strategy_to_string(const struct submodule_update_strategy
*s
)
308 struct strbuf sb
= STRBUF_INIT
;
310 case SM_UPDATE_CHECKOUT
:
312 case SM_UPDATE_MERGE
:
314 case SM_UPDATE_REBASE
:
318 case SM_UPDATE_UNSPECIFIED
:
320 case SM_UPDATE_COMMAND
:
321 strbuf_addf(&sb
, "!%s", s
->command
);
322 return strbuf_detach(&sb
, NULL
);
327 void handle_ignore_submodules_arg(struct diff_options
*diffopt
,
330 DIFF_OPT_CLR(diffopt
, IGNORE_SUBMODULES
);
331 DIFF_OPT_CLR(diffopt
, IGNORE_UNTRACKED_IN_SUBMODULES
);
332 DIFF_OPT_CLR(diffopt
, IGNORE_DIRTY_SUBMODULES
);
334 if (!strcmp(arg
, "all"))
335 DIFF_OPT_SET(diffopt
, IGNORE_SUBMODULES
);
336 else if (!strcmp(arg
, "untracked"))
337 DIFF_OPT_SET(diffopt
, IGNORE_UNTRACKED_IN_SUBMODULES
);
338 else if (!strcmp(arg
, "dirty"))
339 DIFF_OPT_SET(diffopt
, IGNORE_DIRTY_SUBMODULES
);
340 else if (strcmp(arg
, "none"))
341 die("bad --ignore-submodules argument: %s", arg
);
344 static int prepare_submodule_summary(struct rev_info
*rev
, const char *path
,
345 struct commit
*left
, struct commit
*right
,
346 struct commit_list
*merge_bases
)
348 struct commit_list
*list
;
350 init_revisions(rev
, NULL
);
351 setup_revisions(0, NULL
, rev
, NULL
);
353 rev
->first_parent_only
= 1;
354 left
->object
.flags
|= SYMMETRIC_LEFT
;
355 add_pending_object(rev
, &left
->object
, path
);
356 add_pending_object(rev
, &right
->object
, path
);
357 for (list
= merge_bases
; list
; list
= list
->next
) {
358 list
->item
->object
.flags
|= UNINTERESTING
;
359 add_pending_object(rev
, &list
->item
->object
,
360 oid_to_hex(&list
->item
->object
.oid
));
362 return prepare_revision_walk(rev
);
365 static void print_submodule_summary(struct rev_info
*rev
, FILE *f
,
366 const char *line_prefix
,
367 const char *del
, const char *add
, const char *reset
)
369 static const char format
[] = " %m %s";
370 struct strbuf sb
= STRBUF_INIT
;
371 struct commit
*commit
;
373 while ((commit
= get_revision(rev
))) {
374 struct pretty_print_context ctx
= {0};
375 ctx
.date_mode
= rev
->date_mode
;
376 ctx
.output_encoding
= get_log_output_encoding();
377 strbuf_setlen(&sb
, 0);
378 strbuf_addstr(&sb
, line_prefix
);
379 if (commit
->object
.flags
& SYMMETRIC_LEFT
) {
381 strbuf_addstr(&sb
, del
);
384 strbuf_addstr(&sb
, add
);
385 format_commit_message(commit
, format
, &sb
, &ctx
);
387 strbuf_addstr(&sb
, reset
);
388 strbuf_addch(&sb
, '\n');
389 fprintf(f
, "%s", sb
.buf
);
394 static void prepare_submodule_repo_env_no_git_dir(struct argv_array
*out
)
396 const char * const *var
;
398 for (var
= local_repo_env
; *var
; var
++) {
399 if (strcmp(*var
, CONFIG_DATA_ENVIRONMENT
))
400 argv_array_push(out
, *var
);
404 void prepare_submodule_repo_env(struct argv_array
*out
)
406 prepare_submodule_repo_env_no_git_dir(out
);
407 argv_array_pushf(out
, "%s=%s", GIT_DIR_ENVIRONMENT
,
408 DEFAULT_GIT_DIR_ENVIRONMENT
);
411 /* Helper function to display the submodule header line prior to the full
412 * summary output. If it can locate the submodule objects directory it will
413 * attempt to lookup both the left and right commits and put them into the
414 * left and right pointers.
416 static void show_submodule_header(FILE *f
, const char *path
,
417 const char *line_prefix
,
418 struct object_id
*one
, struct object_id
*two
,
419 unsigned dirty_submodule
, const char *meta
,
421 struct commit
**left
, struct commit
**right
,
422 struct commit_list
**merge_bases
)
424 const char *message
= NULL
;
425 struct strbuf sb
= STRBUF_INIT
;
426 int fast_forward
= 0, fast_backward
= 0;
428 if (dirty_submodule
& DIRTY_SUBMODULE_UNTRACKED
)
429 fprintf(f
, "%sSubmodule %s contains untracked content\n",
431 if (dirty_submodule
& DIRTY_SUBMODULE_MODIFIED
)
432 fprintf(f
, "%sSubmodule %s contains modified content\n",
435 if (is_null_oid(one
))
436 message
= "(new submodule)";
437 else if (is_null_oid(two
))
438 message
= "(submodule deleted)";
440 if (add_submodule_odb(path
)) {
442 message
= "(not initialized)";
447 * Attempt to lookup the commit references, and determine if this is
448 * a fast forward or fast backwards update.
450 *left
= lookup_commit_reference(one
->hash
);
451 *right
= lookup_commit_reference(two
->hash
);
454 * Warn about missing commits in the submodule project, but only if
457 if ((!is_null_oid(one
) && !*left
) ||
458 (!is_null_oid(two
) && !*right
))
459 message
= "(commits not present)";
461 *merge_bases
= get_merge_bases(*left
, *right
);
463 if ((*merge_bases
)->item
== *left
)
465 else if ((*merge_bases
)->item
== *right
)
469 if (!oidcmp(one
, two
)) {
475 strbuf_addf(&sb
, "%s%sSubmodule %s ", line_prefix
, meta
, path
);
476 strbuf_add_unique_abbrev(&sb
, one
->hash
, DEFAULT_ABBREV
);
477 strbuf_addstr(&sb
, (fast_backward
|| fast_forward
) ? ".." : "...");
478 strbuf_add_unique_abbrev(&sb
, two
->hash
, DEFAULT_ABBREV
);
480 strbuf_addf(&sb
, " %s%s\n", message
, reset
);
482 strbuf_addf(&sb
, "%s:%s\n", fast_backward
? " (rewind)" : "", reset
);
483 fwrite(sb
.buf
, sb
.len
, 1, f
);
488 void show_submodule_summary(FILE *f
, const char *path
,
489 const char *line_prefix
,
490 struct object_id
*one
, struct object_id
*two
,
491 unsigned dirty_submodule
, const char *meta
,
492 const char *del
, const char *add
, const char *reset
)
495 struct commit
*left
= NULL
, *right
= NULL
;
496 struct commit_list
*merge_bases
= NULL
;
498 show_submodule_header(f
, path
, line_prefix
, one
, two
, dirty_submodule
,
499 meta
, reset
, &left
, &right
, &merge_bases
);
502 * If we don't have both a left and a right pointer, there is no
503 * reason to try and display a summary. The header line should contain
504 * all the information the user needs.
509 /* Treat revision walker failure the same as missing commits */
510 if (prepare_submodule_summary(&rev
, path
, left
, right
, merge_bases
)) {
511 fprintf(f
, "%s(revision walker failed)\n", line_prefix
);
515 print_submodule_summary(&rev
, f
, line_prefix
, del
, add
, reset
);
519 free_commit_list(merge_bases
);
520 clear_commit_marks(left
, ~0);
521 clear_commit_marks(right
, ~0);
524 void show_submodule_inline_diff(FILE *f
, const char *path
,
525 const char *line_prefix
,
526 struct object_id
*one
, struct object_id
*two
,
527 unsigned dirty_submodule
, const char *meta
,
528 const char *del
, const char *add
, const char *reset
,
529 const struct diff_options
*o
)
531 const struct object_id
*old
= &empty_tree_oid
, *new = &empty_tree_oid
;
532 struct commit
*left
= NULL
, *right
= NULL
;
533 struct commit_list
*merge_bases
= NULL
;
534 struct strbuf submodule_dir
= STRBUF_INIT
;
535 struct child_process cp
= CHILD_PROCESS_INIT
;
537 show_submodule_header(f
, path
, line_prefix
, one
, two
, dirty_submodule
,
538 meta
, reset
, &left
, &right
, &merge_bases
);
540 /* We need a valid left and right commit to display a difference */
541 if (!(left
|| is_null_oid(one
)) ||
542 !(right
|| is_null_oid(two
)))
553 cp
.out
= dup(fileno(f
));
556 /* TODO: other options may need to be passed here. */
557 argv_array_push(&cp
.args
, "diff");
558 argv_array_pushf(&cp
.args
, "--line-prefix=%s", line_prefix
);
559 if (DIFF_OPT_TST(o
, REVERSE_DIFF
)) {
560 argv_array_pushf(&cp
.args
, "--src-prefix=%s%s/",
562 argv_array_pushf(&cp
.args
, "--dst-prefix=%s%s/",
565 argv_array_pushf(&cp
.args
, "--src-prefix=%s%s/",
567 argv_array_pushf(&cp
.args
, "--dst-prefix=%s%s/",
570 argv_array_push(&cp
.args
, oid_to_hex(old
));
572 * If the submodule has modified content, we will diff against the
573 * work tree, under the assumption that the user has asked for the
574 * diff format and wishes to actually see all differences even if they
575 * haven't yet been committed to the submodule yet.
577 if (!(dirty_submodule
& DIRTY_SUBMODULE_MODIFIED
))
578 argv_array_push(&cp
.args
, oid_to_hex(new));
580 if (run_command(&cp
))
581 fprintf(f
, "(diff failed)\n");
584 strbuf_release(&submodule_dir
);
586 free_commit_list(merge_bases
);
588 clear_commit_marks(left
, ~0);
590 clear_commit_marks(right
, ~0);
593 void set_config_fetch_recurse_submodules(int value
)
595 config_fetch_recurse_submodules
= value
;
598 void set_config_update_recurse_submodules(int value
)
600 config_update_recurse_submodules
= value
;
603 int should_update_submodules(void)
605 return config_update_recurse_submodules
== RECURSE_SUBMODULES_ON
;
608 const struct submodule
*submodule_from_ce(const struct cache_entry
*ce
)
610 if (!S_ISGITLINK(ce
->ce_mode
))
613 if (!should_update_submodules())
616 return submodule_from_path(null_sha1
, ce
->name
);
619 static int has_remote(const char *refname
, const struct object_id
*oid
,
620 int flags
, void *cb_data
)
625 static int append_sha1_to_argv(const unsigned char sha1
[20], void *data
)
627 struct argv_array
*argv
= data
;
628 argv_array_push(argv
, sha1_to_hex(sha1
));
632 static int check_has_commit(const unsigned char sha1
[20], void *data
)
634 int *has_commit
= data
;
636 if (!lookup_commit_reference(sha1
))
642 static int submodule_has_commits(const char *path
, struct sha1_array
*commits
)
646 if (add_submodule_odb(path
))
649 sha1_array_for_each_unique(commits
, check_has_commit
, &has_commit
);
653 static int submodule_needs_pushing(const char *path
, struct sha1_array
*commits
)
655 if (!submodule_has_commits(path
, commits
))
657 * NOTE: We do consider it safe to return "no" here. The
658 * correct answer would be "We do not know" instead of
659 * "No push needed", but it is quite hard to change
660 * the submodule pointer without having the submodule
661 * around. If a user did however change the submodules
662 * without having the submodule around, this indicates
663 * an expert who knows what they are doing or a
664 * maintainer integrating work from other people. In
665 * both cases it should be safe to skip this check.
669 if (for_each_remote_ref_submodule(path
, has_remote
, NULL
) > 0) {
670 struct child_process cp
= CHILD_PROCESS_INIT
;
671 struct strbuf buf
= STRBUF_INIT
;
672 int needs_pushing
= 0;
674 argv_array_push(&cp
.args
, "rev-list");
675 sha1_array_for_each_unique(commits
, append_sha1_to_argv
, &cp
.args
);
676 argv_array_pushl(&cp
.args
, "--not", "--remotes", "-n", "1" , NULL
);
678 prepare_submodule_repo_env(&cp
.env_array
);
683 if (start_command(&cp
))
684 die("Could not run 'git rev-list <commits> --not --remotes -n 1' command in submodule %s",
686 if (strbuf_read(&buf
, cp
.out
, 41))
690 strbuf_release(&buf
);
691 return needs_pushing
;
697 static struct sha1_array
*submodule_commits(struct string_list
*submodules
,
700 struct string_list_item
*item
;
702 item
= string_list_insert(submodules
, path
);
704 return (struct sha1_array
*) item
->util
;
706 /* NEEDSWORK: should we have sha1_array_init()? */
707 item
->util
= xcalloc(1, sizeof(struct sha1_array
));
708 return (struct sha1_array
*) item
->util
;
711 static void collect_submodules_from_diff(struct diff_queue_struct
*q
,
712 struct diff_options
*options
,
716 struct string_list
*submodules
= data
;
718 for (i
= 0; i
< q
->nr
; i
++) {
719 struct diff_filepair
*p
= q
->queue
[i
];
720 struct sha1_array
*commits
;
721 if (!S_ISGITLINK(p
->two
->mode
))
723 commits
= submodule_commits(submodules
, p
->two
->path
);
724 sha1_array_append(commits
, p
->two
->oid
.hash
);
728 static void find_unpushed_submodule_commits(struct commit
*commit
,
729 struct string_list
*needs_pushing
)
733 init_revisions(&rev
, NULL
);
734 rev
.diffopt
.output_format
|= DIFF_FORMAT_CALLBACK
;
735 rev
.diffopt
.format_callback
= collect_submodules_from_diff
;
736 rev
.diffopt
.format_callback_data
= needs_pushing
;
737 diff_tree_combined_merge(commit
, 1, &rev
);
740 static void free_submodules_sha1s(struct string_list
*submodules
)
742 struct string_list_item
*item
;
743 for_each_string_list_item(item
, submodules
)
744 sha1_array_clear((struct sha1_array
*) item
->util
);
745 string_list_clear(submodules
, 1);
748 int find_unpushed_submodules(struct sha1_array
*commits
,
749 const char *remotes_name
, struct string_list
*needs_pushing
)
752 struct commit
*commit
;
753 struct string_list submodules
= STRING_LIST_INIT_DUP
;
754 struct string_list_item
*submodule
;
755 struct argv_array argv
= ARGV_ARRAY_INIT
;
757 init_revisions(&rev
, NULL
);
759 /* argv.argv[0] will be ignored by setup_revisions */
760 argv_array_push(&argv
, "find_unpushed_submodules");
761 sha1_array_for_each_unique(commits
, append_sha1_to_argv
, &argv
);
762 argv_array_push(&argv
, "--not");
763 argv_array_pushf(&argv
, "--remotes=%s", remotes_name
);
765 setup_revisions(argv
.argc
, argv
.argv
, &rev
, NULL
);
766 if (prepare_revision_walk(&rev
))
767 die("revision walk setup failed");
769 while ((commit
= get_revision(&rev
)) != NULL
)
770 find_unpushed_submodule_commits(commit
, &submodules
);
772 reset_revision_walk();
773 argv_array_clear(&argv
);
775 for_each_string_list_item(submodule
, &submodules
) {
776 struct sha1_array
*commits
= (struct sha1_array
*) submodule
->util
;
778 if (submodule_needs_pushing(submodule
->string
, commits
))
779 string_list_insert(needs_pushing
, submodule
->string
);
781 free_submodules_sha1s(&submodules
);
783 return needs_pushing
->nr
;
786 static int push_submodule(const char *path
,
787 const struct remote
*remote
,
788 const char **refspec
, int refspec_nr
,
789 const struct string_list
*push_options
,
792 if (add_submodule_odb(path
))
795 if (for_each_remote_ref_submodule(path
, has_remote
, NULL
) > 0) {
796 struct child_process cp
= CHILD_PROCESS_INIT
;
797 argv_array_push(&cp
.args
, "push");
799 argv_array_push(&cp
.args
, "--dry-run");
801 if (push_options
&& push_options
->nr
) {
802 const struct string_list_item
*item
;
803 for_each_string_list_item(item
, push_options
)
804 argv_array_pushf(&cp
.args
, "--push-option=%s",
808 if (remote
->origin
!= REMOTE_UNCONFIGURED
) {
810 argv_array_push(&cp
.args
, remote
->name
);
811 for (i
= 0; i
< refspec_nr
; i
++)
812 argv_array_push(&cp
.args
, refspec
[i
]);
815 prepare_submodule_repo_env(&cp
.env_array
);
819 if (run_command(&cp
))
828 * Perform a check in the submodule to see if the remote and refspec work.
829 * Die if the submodule can't be pushed.
831 static void submodule_push_check(const char *path
, const struct remote
*remote
,
832 const char **refspec
, int refspec_nr
)
834 struct child_process cp
= CHILD_PROCESS_INIT
;
837 argv_array_push(&cp
.args
, "submodule--helper");
838 argv_array_push(&cp
.args
, "push-check");
839 argv_array_push(&cp
.args
, remote
->name
);
841 for (i
= 0; i
< refspec_nr
; i
++)
842 argv_array_push(&cp
.args
, refspec
[i
]);
844 prepare_submodule_repo_env(&cp
.env_array
);
851 * Simply indicate if 'submodule--helper push-check' failed.
852 * More detailed error information will be provided by the
855 if (run_command(&cp
))
856 die("process for submodule '%s' failed", path
);
859 int push_unpushed_submodules(struct sha1_array
*commits
,
860 const struct remote
*remote
,
861 const char **refspec
, int refspec_nr
,
862 const struct string_list
*push_options
,
866 struct string_list needs_pushing
= STRING_LIST_INIT_DUP
;
868 if (!find_unpushed_submodules(commits
, remote
->name
, &needs_pushing
))
872 * Verify that the remote and refspec can be propagated to all
873 * submodules. This check can be skipped if the remote and refspec
874 * won't be propagated due to the remote being unconfigured (e.g. a URL
875 * instead of a remote name).
877 if (remote
->origin
!= REMOTE_UNCONFIGURED
)
878 for (i
= 0; i
< needs_pushing
.nr
; i
++)
879 submodule_push_check(needs_pushing
.items
[i
].string
,
880 remote
, refspec
, refspec_nr
);
882 /* Actually push the submodules */
883 for (i
= 0; i
< needs_pushing
.nr
; i
++) {
884 const char *path
= needs_pushing
.items
[i
].string
;
885 fprintf(stderr
, "Pushing submodule '%s'\n", path
);
886 if (!push_submodule(path
, remote
, refspec
, refspec_nr
,
887 push_options
, dry_run
)) {
888 fprintf(stderr
, "Unable to push submodule '%s'\n", path
);
893 string_list_clear(&needs_pushing
, 0);
898 static int is_submodule_commit_present(const char *path
, unsigned char sha1
[20])
901 if (!add_submodule_odb(path
) && lookup_commit_reference(sha1
)) {
902 /* Even if the submodule is checked out and the commit is
903 * present, make sure it is reachable from a ref. */
904 struct child_process cp
= CHILD_PROCESS_INIT
;
905 const char *argv
[] = {"rev-list", "-n", "1", NULL
, "--not", "--all", NULL
};
906 struct strbuf buf
= STRBUF_INIT
;
908 argv
[3] = sha1_to_hex(sha1
);
910 prepare_submodule_repo_env(&cp
.env_array
);
914 if (!capture_command(&cp
, &buf
, 1024) && !buf
.len
)
917 strbuf_release(&buf
);
922 static void submodule_collect_changed_cb(struct diff_queue_struct
*q
,
923 struct diff_options
*options
,
927 for (i
= 0; i
< q
->nr
; i
++) {
928 struct diff_filepair
*p
= q
->queue
[i
];
929 if (!S_ISGITLINK(p
->two
->mode
))
932 if (S_ISGITLINK(p
->one
->mode
)) {
933 /* NEEDSWORK: We should honor the name configured in
934 * the .gitmodules file of the commit we are examining
935 * here to be able to correctly follow submodules
936 * being moved around. */
937 struct string_list_item
*path
;
938 path
= unsorted_string_list_lookup(&changed_submodule_paths
, p
->two
->path
);
939 if (!path
&& !is_submodule_commit_present(p
->two
->path
, p
->two
->oid
.hash
))
940 string_list_append(&changed_submodule_paths
, xstrdup(p
->two
->path
));
942 /* Submodule is new or was moved here */
943 /* NEEDSWORK: When the .git directories of submodules
944 * live inside the superprojects .git directory some
945 * day we should fetch new submodules directly into
946 * that location too when config or options request
947 * that so they can be checked out from there. */
953 static int add_sha1_to_array(const char *ref
, const struct object_id
*oid
,
954 int flags
, void *data
)
956 sha1_array_append(data
, oid
->hash
);
960 void check_for_new_submodule_commits(unsigned char new_sha1
[20])
962 if (!initialized_fetch_ref_tips
) {
963 for_each_ref(add_sha1_to_array
, &ref_tips_before_fetch
);
964 initialized_fetch_ref_tips
= 1;
967 sha1_array_append(&ref_tips_after_fetch
, new_sha1
);
970 static int add_sha1_to_argv(const unsigned char sha1
[20], void *data
)
972 argv_array_push(data
, sha1_to_hex(sha1
));
976 static void calculate_changed_submodule_paths(void)
979 struct commit
*commit
;
980 struct argv_array argv
= ARGV_ARRAY_INIT
;
982 /* No need to check if there are no submodules configured */
983 if (!submodule_from_path(NULL
, NULL
))
986 init_revisions(&rev
, NULL
);
987 argv_array_push(&argv
, "--"); /* argv[0] program name */
988 sha1_array_for_each_unique(&ref_tips_after_fetch
,
989 add_sha1_to_argv
, &argv
);
990 argv_array_push(&argv
, "--not");
991 sha1_array_for_each_unique(&ref_tips_before_fetch
,
992 add_sha1_to_argv
, &argv
);
993 setup_revisions(argv
.argc
, argv
.argv
, &rev
, NULL
);
994 if (prepare_revision_walk(&rev
))
995 die("revision walk setup failed");
998 * Collect all submodules (whether checked out or not) for which new
999 * commits have been recorded upstream in "changed_submodule_paths".
1001 while ((commit
= get_revision(&rev
))) {
1002 struct commit_list
*parent
= commit
->parents
;
1004 struct diff_options diff_opts
;
1005 diff_setup(&diff_opts
);
1006 DIFF_OPT_SET(&diff_opts
, RECURSIVE
);
1007 diff_opts
.output_format
|= DIFF_FORMAT_CALLBACK
;
1008 diff_opts
.format_callback
= submodule_collect_changed_cb
;
1009 diff_setup_done(&diff_opts
);
1010 diff_tree_sha1(parent
->item
->object
.oid
.hash
, commit
->object
.oid
.hash
, "", &diff_opts
);
1011 diffcore_std(&diff_opts
);
1012 diff_flush(&diff_opts
);
1013 parent
= parent
->next
;
1017 argv_array_clear(&argv
);
1018 sha1_array_clear(&ref_tips_before_fetch
);
1019 sha1_array_clear(&ref_tips_after_fetch
);
1020 initialized_fetch_ref_tips
= 0;
1023 struct submodule_parallel_fetch
{
1025 struct argv_array args
;
1026 const char *work_tree
;
1028 int command_line_option
;
1032 #define SPF_INIT {0, ARGV_ARRAY_INIT, NULL, NULL, 0, 0, 0}
1034 static int get_next_submodule(struct child_process
*cp
,
1035 struct strbuf
*err
, void *data
, void **task_cb
)
1038 struct submodule_parallel_fetch
*spf
= data
;
1040 for (; spf
->count
< active_nr
; spf
->count
++) {
1041 struct strbuf submodule_path
= STRBUF_INIT
;
1042 struct strbuf submodule_git_dir
= STRBUF_INIT
;
1043 struct strbuf submodule_prefix
= STRBUF_INIT
;
1044 const struct cache_entry
*ce
= active_cache
[spf
->count
];
1045 const char *git_dir
, *default_argv
;
1046 const struct submodule
*submodule
;
1048 if (!S_ISGITLINK(ce
->ce_mode
))
1051 submodule
= submodule_from_path(null_sha1
, ce
->name
);
1053 submodule
= submodule_from_name(null_sha1
, ce
->name
);
1055 default_argv
= "yes";
1056 if (spf
->command_line_option
== RECURSE_SUBMODULES_DEFAULT
) {
1058 submodule
->fetch_recurse
!=
1059 RECURSE_SUBMODULES_NONE
) {
1060 if (submodule
->fetch_recurse
==
1061 RECURSE_SUBMODULES_OFF
)
1063 if (submodule
->fetch_recurse
==
1064 RECURSE_SUBMODULES_ON_DEMAND
) {
1065 if (!unsorted_string_list_lookup(&changed_submodule_paths
, ce
->name
))
1067 default_argv
= "on-demand";
1070 if ((config_fetch_recurse_submodules
== RECURSE_SUBMODULES_OFF
) ||
1071 gitmodules_is_unmerged
)
1073 if (config_fetch_recurse_submodules
== RECURSE_SUBMODULES_ON_DEMAND
) {
1074 if (!unsorted_string_list_lookup(&changed_submodule_paths
, ce
->name
))
1076 default_argv
= "on-demand";
1079 } else if (spf
->command_line_option
== RECURSE_SUBMODULES_ON_DEMAND
) {
1080 if (!unsorted_string_list_lookup(&changed_submodule_paths
, ce
->name
))
1082 default_argv
= "on-demand";
1085 strbuf_addf(&submodule_path
, "%s/%s", spf
->work_tree
, ce
->name
);
1086 strbuf_addf(&submodule_git_dir
, "%s/.git", submodule_path
.buf
);
1087 strbuf_addf(&submodule_prefix
, "%s%s/", spf
->prefix
, ce
->name
);
1088 git_dir
= read_gitfile(submodule_git_dir
.buf
);
1090 git_dir
= submodule_git_dir
.buf
;
1091 if (is_directory(git_dir
)) {
1092 child_process_init(cp
);
1093 cp
->dir
= strbuf_detach(&submodule_path
, NULL
);
1094 prepare_submodule_repo_env(&cp
->env_array
);
1097 strbuf_addf(err
, "Fetching submodule %s%s\n",
1098 spf
->prefix
, ce
->name
);
1099 argv_array_init(&cp
->args
);
1100 argv_array_pushv(&cp
->args
, spf
->args
.argv
);
1101 argv_array_push(&cp
->args
, default_argv
);
1102 argv_array_push(&cp
->args
, "--submodule-prefix");
1103 argv_array_push(&cp
->args
, submodule_prefix
.buf
);
1106 strbuf_release(&submodule_path
);
1107 strbuf_release(&submodule_git_dir
);
1108 strbuf_release(&submodule_prefix
);
1117 static int fetch_start_failure(struct strbuf
*err
,
1118 void *cb
, void *task_cb
)
1120 struct submodule_parallel_fetch
*spf
= cb
;
1127 static int fetch_finish(int retvalue
, struct strbuf
*err
,
1128 void *cb
, void *task_cb
)
1130 struct submodule_parallel_fetch
*spf
= cb
;
1138 int fetch_populated_submodules(const struct argv_array
*options
,
1139 const char *prefix
, int command_line_option
,
1140 int quiet
, int max_parallel_jobs
)
1143 struct submodule_parallel_fetch spf
= SPF_INIT
;
1145 spf
.work_tree
= get_git_work_tree();
1146 spf
.command_line_option
= command_line_option
;
1148 spf
.prefix
= prefix
;
1153 if (read_cache() < 0)
1154 die("index file corrupt");
1156 argv_array_push(&spf
.args
, "fetch");
1157 for (i
= 0; i
< options
->argc
; i
++)
1158 argv_array_push(&spf
.args
, options
->argv
[i
]);
1159 argv_array_push(&spf
.args
, "--recurse-submodules-default");
1160 /* default value, "--submodule-prefix" and its value are added later */
1162 if (max_parallel_jobs
< 0)
1163 max_parallel_jobs
= parallel_jobs
;
1165 calculate_changed_submodule_paths();
1166 run_processes_parallel(max_parallel_jobs
,
1168 fetch_start_failure
,
1172 argv_array_clear(&spf
.args
);
1174 string_list_clear(&changed_submodule_paths
, 1);
1178 unsigned is_submodule_modified(const char *path
, int ignore_untracked
)
1181 struct child_process cp
= CHILD_PROCESS_INIT
;
1182 const char *argv
[] = {
1188 struct strbuf buf
= STRBUF_INIT
;
1189 unsigned dirty_submodule
= 0;
1190 const char *line
, *next_line
;
1191 const char *git_dir
;
1193 strbuf_addf(&buf
, "%s/.git", path
);
1194 git_dir
= read_gitfile(buf
.buf
);
1197 if (!is_directory(git_dir
)) {
1198 strbuf_release(&buf
);
1199 /* The submodule is not checked out, so it is not modified */
1205 if (ignore_untracked
)
1209 prepare_submodule_repo_env(&cp
.env_array
);
1214 if (start_command(&cp
))
1215 die("Could not run 'git status --porcelain' in submodule %s", path
);
1217 len
= strbuf_read(&buf
, cp
.out
, 1024);
1220 if ((line
[0] == '?') && (line
[1] == '?')) {
1221 dirty_submodule
|= DIRTY_SUBMODULE_UNTRACKED
;
1222 if (dirty_submodule
& DIRTY_SUBMODULE_MODIFIED
)
1225 dirty_submodule
|= DIRTY_SUBMODULE_MODIFIED
;
1226 if (ignore_untracked
||
1227 (dirty_submodule
& DIRTY_SUBMODULE_UNTRACKED
))
1230 next_line
= strchr(line
, '\n');
1234 len
-= (next_line
- line
);
1239 if (finish_command(&cp
))
1240 die("'git status --porcelain' failed in submodule %s", path
);
1242 strbuf_release(&buf
);
1243 return dirty_submodule
;
1246 int submodule_uses_gitfile(const char *path
)
1248 struct child_process cp
= CHILD_PROCESS_INIT
;
1249 const char *argv
[] = {
1257 struct strbuf buf
= STRBUF_INIT
;
1258 const char *git_dir
;
1260 strbuf_addf(&buf
, "%s/.git", path
);
1261 git_dir
= read_gitfile(buf
.buf
);
1263 strbuf_release(&buf
);
1266 strbuf_release(&buf
);
1268 /* Now test that all nested submodules use a gitfile too */
1270 prepare_submodule_repo_env(&cp
.env_array
);
1276 if (run_command(&cp
))
1283 * Check if it is a bad idea to remove a submodule, i.e. if we'd lose data
1286 * Return 1 if we'd lose data, return 0 if the removal is fine,
1287 * and negative values for errors.
1289 int bad_to_remove_submodule(const char *path
, unsigned flags
)
1292 struct child_process cp
= CHILD_PROCESS_INIT
;
1293 struct strbuf buf
= STRBUF_INIT
;
1296 if (!file_exists(path
) || is_empty_dir(path
))
1299 if (!submodule_uses_gitfile(path
))
1302 argv_array_pushl(&cp
.args
, "status", "--porcelain",
1303 "--ignore-submodules=none", NULL
);
1305 if (flags
& SUBMODULE_REMOVAL_IGNORE_UNTRACKED
)
1306 argv_array_push(&cp
.args
, "-uno");
1308 argv_array_push(&cp
.args
, "-uall");
1310 if (!(flags
& SUBMODULE_REMOVAL_IGNORE_IGNORED_UNTRACKED
))
1311 argv_array_push(&cp
.args
, "--ignored");
1313 prepare_submodule_repo_env(&cp
.env_array
);
1318 if (start_command(&cp
)) {
1319 if (flags
& SUBMODULE_REMOVAL_DIE_ON_ERROR
)
1320 die(_("could not start 'git status in submodule '%s'"),
1326 len
= strbuf_read(&buf
, cp
.out
, 1024);
1331 if (finish_command(&cp
)) {
1332 if (flags
& SUBMODULE_REMOVAL_DIE_ON_ERROR
)
1333 die(_("could not run 'git status in submodule '%s'"),
1338 strbuf_release(&buf
);
1342 static const char *get_super_prefix_or_empty(void)
1344 const char *s
= get_super_prefix();
1350 static int submodule_has_dirty_index(const struct submodule
*sub
)
1352 struct child_process cp
= CHILD_PROCESS_INIT
;
1354 prepare_submodule_repo_env_no_git_dir(&cp
.env_array
);
1357 argv_array_pushl(&cp
.args
, "diff-index", "--quiet",
1358 "--cached", "HEAD", NULL
);
1362 if (start_command(&cp
))
1363 die("could not recurse into submodule '%s'", sub
->path
);
1365 return finish_command(&cp
);
1368 static void submodule_reset_index(const char *path
)
1370 struct child_process cp
= CHILD_PROCESS_INIT
;
1371 prepare_submodule_repo_env_no_git_dir(&cp
.env_array
);
1377 argv_array_pushf(&cp
.args
, "--super-prefix=%s%s/",
1378 get_super_prefix_or_empty(), path
);
1379 argv_array_pushl(&cp
.args
, "read-tree", "-u", "--reset", NULL
);
1381 argv_array_push(&cp
.args
, EMPTY_TREE_SHA1_HEX
);
1383 if (run_command(&cp
))
1384 die("could not reset submodule index");
1388 * Moves a submodule at a given path from a given head to another new head.
1389 * For edge cases (a submodule coming into existence or removing a submodule)
1390 * pass NULL for old or new respectively.
1392 int submodule_move_head(const char *path
,
1398 struct child_process cp
= CHILD_PROCESS_INIT
;
1399 const struct submodule
*sub
;
1401 sub
= submodule_from_path(null_sha1
, path
);
1404 die("BUG: could not get submodule information for '%s'", path
);
1406 if (old
&& !(flags
& SUBMODULE_MOVE_HEAD_FORCE
)) {
1407 /* Check if the submodule has a dirty index. */
1408 if (submodule_has_dirty_index(sub
))
1409 return error(_("submodule '%s' has dirty index"), path
);
1412 if (!(flags
& SUBMODULE_MOVE_HEAD_DRY_RUN
)) {
1414 if (!submodule_uses_gitfile(path
))
1415 absorb_git_dir_into_superproject("", path
,
1416 ABSORB_GITDIR_RECURSE_SUBMODULES
);
1418 struct strbuf sb
= STRBUF_INIT
;
1419 strbuf_addf(&sb
, "%s/modules/%s",
1420 get_git_common_dir(), sub
->name
);
1421 connect_work_tree_and_git_dir(path
, sb
.buf
);
1422 strbuf_release(&sb
);
1424 /* make sure the index is clean as well */
1425 submodule_reset_index(path
);
1429 prepare_submodule_repo_env_no_git_dir(&cp
.env_array
);
1435 argv_array_pushf(&cp
.args
, "--super-prefix=%s%s/",
1436 get_super_prefix_or_empty(), path
);
1437 argv_array_pushl(&cp
.args
, "read-tree", NULL
);
1439 if (flags
& SUBMODULE_MOVE_HEAD_DRY_RUN
)
1440 argv_array_push(&cp
.args
, "-n");
1442 argv_array_push(&cp
.args
, "-u");
1444 if (flags
& SUBMODULE_MOVE_HEAD_FORCE
)
1445 argv_array_push(&cp
.args
, "--reset");
1447 argv_array_push(&cp
.args
, "-m");
1449 argv_array_push(&cp
.args
, old
? old
: EMPTY_TREE_SHA1_HEX
);
1450 argv_array_push(&cp
.args
, new ? new : EMPTY_TREE_SHA1_HEX
);
1452 if (run_command(&cp
)) {
1457 if (!(flags
& SUBMODULE_MOVE_HEAD_DRY_RUN
)) {
1459 struct child_process cp1
= CHILD_PROCESS_INIT
;
1460 /* also set the HEAD accordingly */
1465 argv_array_pushl(&cp1
.args
, "update-ref", "HEAD",
1466 new ? new : EMPTY_TREE_SHA1_HEX
, NULL
);
1468 if (run_command(&cp1
)) {
1473 struct strbuf sb
= STRBUF_INIT
;
1475 strbuf_addf(&sb
, "%s/.git", path
);
1476 unlink_or_warn(sb
.buf
);
1477 strbuf_release(&sb
);
1479 if (is_empty_dir(path
))
1480 rmdir_or_warn(path
);
1487 static int find_first_merges(struct object_array
*result
, const char *path
,
1488 struct commit
*a
, struct commit
*b
)
1491 struct object_array merges
= OBJECT_ARRAY_INIT
;
1492 struct commit
*commit
;
1493 int contains_another
;
1495 char merged_revision
[42];
1496 const char *rev_args
[] = { "rev-list", "--merges", "--ancestry-path",
1497 "--all", merged_revision
, NULL
};
1498 struct rev_info revs
;
1499 struct setup_revision_opt rev_opts
;
1501 memset(result
, 0, sizeof(struct object_array
));
1502 memset(&rev_opts
, 0, sizeof(rev_opts
));
1504 /* get all revisions that merge commit a */
1505 snprintf(merged_revision
, sizeof(merged_revision
), "^%s",
1506 oid_to_hex(&a
->object
.oid
));
1507 init_revisions(&revs
, NULL
);
1508 rev_opts
.submodule
= path
;
1509 setup_revisions(ARRAY_SIZE(rev_args
)-1, rev_args
, &revs
, &rev_opts
);
1511 /* save all revisions from the above list that contain b */
1512 if (prepare_revision_walk(&revs
))
1513 die("revision walk setup failed");
1514 while ((commit
= get_revision(&revs
)) != NULL
) {
1515 struct object
*o
= &(commit
->object
);
1516 if (in_merge_bases(b
, commit
))
1517 add_object_array(o
, NULL
, &merges
);
1519 reset_revision_walk();
1521 /* Now we've got all merges that contain a and b. Prune all
1522 * merges that contain another found merge and save them in
1525 for (i
= 0; i
< merges
.nr
; i
++) {
1526 struct commit
*m1
= (struct commit
*) merges
.objects
[i
].item
;
1528 contains_another
= 0;
1529 for (j
= 0; j
< merges
.nr
; j
++) {
1530 struct commit
*m2
= (struct commit
*) merges
.objects
[j
].item
;
1531 if (i
!= j
&& in_merge_bases(m2
, m1
)) {
1532 contains_another
= 1;
1537 if (!contains_another
)
1538 add_object_array(merges
.objects
[i
].item
, NULL
, result
);
1541 free(merges
.objects
);
1545 static void print_commit(struct commit
*commit
)
1547 struct strbuf sb
= STRBUF_INIT
;
1548 struct pretty_print_context ctx
= {0};
1549 ctx
.date_mode
.type
= DATE_NORMAL
;
1550 format_commit_message(commit
, " %h: %m %s", &sb
, &ctx
);
1551 fprintf(stderr
, "%s\n", sb
.buf
);
1552 strbuf_release(&sb
);
1555 #define MERGE_WARNING(path, msg) \
1556 warning("Failed to merge submodule %s (%s)", path, msg);
1558 int merge_submodule(unsigned char result
[20], const char *path
,
1559 const unsigned char base
[20], const unsigned char a
[20],
1560 const unsigned char b
[20], int search
)
1562 struct commit
*commit_base
, *commit_a
, *commit_b
;
1564 struct object_array merges
;
1568 /* store a in result in case we fail */
1571 /* we can not handle deletion conflicts */
1572 if (is_null_sha1(base
))
1574 if (is_null_sha1(a
))
1576 if (is_null_sha1(b
))
1579 if (add_submodule_odb(path
)) {
1580 MERGE_WARNING(path
, "not checked out");
1584 if (!(commit_base
= lookup_commit_reference(base
)) ||
1585 !(commit_a
= lookup_commit_reference(a
)) ||
1586 !(commit_b
= lookup_commit_reference(b
))) {
1587 MERGE_WARNING(path
, "commits not present");
1591 /* check whether both changes are forward */
1592 if (!in_merge_bases(commit_base
, commit_a
) ||
1593 !in_merge_bases(commit_base
, commit_b
)) {
1594 MERGE_WARNING(path
, "commits don't follow merge-base");
1598 /* Case #1: a is contained in b or vice versa */
1599 if (in_merge_bases(commit_a
, commit_b
)) {
1603 if (in_merge_bases(commit_b
, commit_a
)) {
1609 * Case #2: There are one or more merges that contain a and b in
1610 * the submodule. If there is only one, then present it as a
1611 * suggestion to the user, but leave it marked unmerged so the
1612 * user needs to confirm the resolution.
1615 /* Skip the search if makes no sense to the calling context. */
1619 /* find commit which merges them */
1620 parent_count
= find_first_merges(&merges
, path
, commit_a
, commit_b
);
1621 switch (parent_count
) {
1623 MERGE_WARNING(path
, "merge following commits not found");
1627 MERGE_WARNING(path
, "not fast-forward");
1628 fprintf(stderr
, "Found a possible merge resolution "
1629 "for the submodule:\n");
1630 print_commit((struct commit
*) merges
.objects
[0].item
);
1632 "If this is correct simply add it to the index "
1635 " git update-index --cacheinfo 160000 %s \"%s\"\n\n"
1636 "which will accept this suggestion.\n",
1637 oid_to_hex(&merges
.objects
[0].item
->oid
), path
);
1641 MERGE_WARNING(path
, "multiple merges found");
1642 for (i
= 0; i
< merges
.nr
; i
++)
1643 print_commit((struct commit
*) merges
.objects
[i
].item
);
1646 free(merges
.objects
);
1650 int parallel_submodules(void)
1652 return parallel_jobs
;
1656 * Embeds a single submodules git directory into the superprojects git dir,
1659 static void relocate_single_git_dir_into_superproject(const char *prefix
,
1662 char *old_git_dir
= NULL
, *real_old_git_dir
= NULL
, *real_new_git_dir
= NULL
;
1663 const char *new_git_dir
;
1664 const struct submodule
*sub
;
1666 if (submodule_uses_worktrees(path
))
1667 die(_("relocate_gitdir for submodule '%s' with "
1668 "more than one worktree not supported"), path
);
1670 old_git_dir
= xstrfmt("%s/.git", path
);
1671 if (read_gitfile(old_git_dir
))
1672 /* If it is an actual gitfile, it doesn't need migration. */
1675 real_old_git_dir
= real_pathdup(old_git_dir
, 1);
1677 sub
= submodule_from_path(null_sha1
, path
);
1679 die(_("could not lookup name for submodule '%s'"), path
);
1681 new_git_dir
= git_path("modules/%s", sub
->name
);
1682 if (safe_create_leading_directories_const(new_git_dir
) < 0)
1683 die(_("could not create directory '%s'"), new_git_dir
);
1684 real_new_git_dir
= real_pathdup(new_git_dir
, 1);
1686 fprintf(stderr
, _("Migrating git directory of '%s%s' from\n'%s' to\n'%s'\n"),
1687 get_super_prefix_or_empty(), path
,
1688 real_old_git_dir
, real_new_git_dir
);
1690 relocate_gitdir(path
, real_old_git_dir
, real_new_git_dir
);
1693 free(real_old_git_dir
);
1694 free(real_new_git_dir
);
1698 * Migrate the git directory of the submodule given by path from
1699 * having its git directory within the working tree to the git dir nested
1700 * in its superprojects git dir under modules/.
1702 void absorb_git_dir_into_superproject(const char *prefix
,
1707 const char *sub_git_dir
;
1708 struct strbuf gitdir
= STRBUF_INIT
;
1709 strbuf_addf(&gitdir
, "%s/.git", path
);
1710 sub_git_dir
= resolve_gitdir_gently(gitdir
.buf
, &err_code
);
1712 /* Not populated? */
1714 const struct submodule
*sub
;
1716 if (err_code
== READ_GITFILE_ERR_STAT_FAILED
) {
1717 /* unpopulated as expected */
1718 strbuf_release(&gitdir
);
1722 if (err_code
!= READ_GITFILE_ERR_NOT_A_REPO
)
1723 /* We don't know what broke here. */
1724 read_gitfile_error_die(err_code
, path
, NULL
);
1727 * Maybe populated, but no git directory was found?
1728 * This can happen if the superproject is a submodule
1729 * itself and was just absorbed. The absorption of the
1730 * superproject did not rewrite the git file links yet,
1733 sub
= submodule_from_path(null_sha1
, path
);
1735 die(_("could not lookup name for submodule '%s'"), path
);
1736 connect_work_tree_and_git_dir(path
,
1737 git_path("modules/%s", sub
->name
));
1739 /* Is it already absorbed into the superprojects git dir? */
1740 char *real_sub_git_dir
= real_pathdup(sub_git_dir
, 1);
1741 char *real_common_git_dir
= real_pathdup(get_git_common_dir(), 1);
1743 if (!starts_with(real_sub_git_dir
, real_common_git_dir
))
1744 relocate_single_git_dir_into_superproject(prefix
, path
);
1746 free(real_sub_git_dir
);
1747 free(real_common_git_dir
);
1749 strbuf_release(&gitdir
);
1751 if (flags
& ABSORB_GITDIR_RECURSE_SUBMODULES
) {
1752 struct child_process cp
= CHILD_PROCESS_INIT
;
1753 struct strbuf sb
= STRBUF_INIT
;
1755 if (flags
& ~ABSORB_GITDIR_RECURSE_SUBMODULES
)
1756 die("BUG: we don't know how to pass the flags down?");
1758 strbuf_addstr(&sb
, get_super_prefix_or_empty());
1759 strbuf_addstr(&sb
, path
);
1760 strbuf_addch(&sb
, '/');
1765 argv_array_pushl(&cp
.args
, "--super-prefix", sb
.buf
,
1766 "submodule--helper",
1767 "absorb-git-dirs", NULL
);
1768 prepare_submodule_repo_env(&cp
.env_array
);
1769 if (run_command(&cp
))
1770 die(_("could not recurse into submodule '%s'"), path
);
1772 strbuf_release(&sb
);
1776 const char *get_superproject_working_tree(void)
1778 struct child_process cp
= CHILD_PROCESS_INIT
;
1779 struct strbuf sb
= STRBUF_INIT
;
1780 const char *one_up
= real_path_if_valid("../");
1781 const char *cwd
= xgetcwd();
1782 const char *ret
= NULL
;
1783 const char *subpath
;
1787 if (!is_inside_work_tree())
1790 * We might have a superproject, but it is harder
1798 subpath
= relative_path(cwd
, one_up
, &sb
);
1800 prepare_submodule_repo_env(&cp
.env_array
);
1801 argv_array_pop(&cp
.env_array
);
1803 argv_array_pushl(&cp
.args
, "--literal-pathspecs", "-C", "..",
1804 "ls-files", "-z", "--stage", "--full-name", "--",
1813 if (start_command(&cp
))
1814 die(_("could not start ls-files in .."));
1816 len
= strbuf_read(&sb
, cp
.out
, PATH_MAX
);
1819 if (starts_with(sb
.buf
, "160000")) {
1821 int cwd_len
= strlen(cwd
);
1822 char *super_sub
, *super_wt
;
1825 * There is a superproject having this repo as a submodule.
1826 * The format is <mode> SP <hash> SP <stage> TAB <full name> \0,
1827 * We're only interested in the name after the tab.
1829 super_sub
= strchr(sb
.buf
, '\t') + 1;
1830 super_sub_len
= sb
.buf
+ sb
.len
- super_sub
- 1;
1832 if (super_sub_len
> cwd_len
||
1833 strcmp(&cwd
[cwd_len
- super_sub_len
], super_sub
))
1834 die (_("BUG: returned path string doesn't match cwd?"));
1836 super_wt
= xstrdup(cwd
);
1837 super_wt
[cwd_len
- super_sub_len
] = '\0';
1839 ret
= real_path(super_wt
);
1842 strbuf_release(&sb
);
1844 code
= finish_command(&cp
);
1847 /* '../' is not a git repository */
1849 if (code
== 0 && len
== 0)
1850 /* There is an unrelated git repository at '../' */
1853 die(_("ls-tree returned unexpected return code %d"), code
);