2 #include "repository.h"
4 #include "submodule-config.h"
10 #include "run-command.h"
13 #include "string-list.h"
14 #include "sha1-array.h"
15 #include "argv-array.h"
17 #include "thread-utils.h"
21 #include "parse-options.h"
23 static int config_update_recurse_submodules
= RECURSE_SUBMODULES_OFF
;
24 static struct string_list changed_submodule_paths
= STRING_LIST_INIT_DUP
;
25 static int initialized_fetch_ref_tips
;
26 static struct oid_array ref_tips_before_fetch
;
27 static struct oid_array ref_tips_after_fetch
;
30 * Check if the .gitmodules file is unmerged. Parsing of the .gitmodules file
31 * will be disabled because we can't guess what might be configured in
32 * .gitmodules unless the user resolves the conflict.
34 int is_gitmodules_unmerged(const struct index_state
*istate
)
36 int pos
= index_name_pos(istate
, GITMODULES_FILE
, strlen(GITMODULES_FILE
));
37 if (pos
< 0) { /* .gitmodules not found or isn't merged */
39 if (istate
->cache_nr
> pos
) { /* there is a .gitmodules */
40 const struct cache_entry
*ce
= istate
->cache
[pos
];
41 if (ce_namelen(ce
) == strlen(GITMODULES_FILE
) &&
42 !strcmp(ce
->name
, GITMODULES_FILE
))
51 * Check if the .gitmodules file has unstaged modifications. This must be
52 * checked before allowing modifications to the .gitmodules file with the
53 * intention to stage them later, because when continuing we would stage the
54 * modifications the user didn't stage herself too. That might change in a
55 * future version when we learn to stage the changes we do ourselves without
56 * staging any previous modifications.
58 int is_staging_gitmodules_ok(const struct index_state
*istate
)
60 int pos
= index_name_pos(istate
, GITMODULES_FILE
, strlen(GITMODULES_FILE
));
62 if ((pos
>= 0) && (pos
< istate
->cache_nr
)) {
64 if (lstat(GITMODULES_FILE
, &st
) == 0 &&
65 ce_match_stat(istate
->cache
[pos
], &st
, 0) & DATA_CHANGED
)
73 * Try to update the "path" entry in the "submodule.<name>" section of the
74 * .gitmodules file. Return 0 only if a .gitmodules file was found, a section
75 * with the correct path=<oldpath> setting was found and we could update it.
77 int update_path_in_gitmodules(const char *oldpath
, const char *newpath
)
79 struct strbuf entry
= STRBUF_INIT
;
80 const struct submodule
*submodule
;
82 if (!file_exists(GITMODULES_FILE
)) /* Do nothing without .gitmodules */
85 if (is_gitmodules_unmerged(&the_index
))
86 die(_("Cannot change unmerged .gitmodules, resolve merge conflicts first"));
88 submodule
= submodule_from_path(&null_oid
, oldpath
);
89 if (!submodule
|| !submodule
->name
) {
90 warning(_("Could not find section in .gitmodules where path=%s"), oldpath
);
93 strbuf_addstr(&entry
, "submodule.");
94 strbuf_addstr(&entry
, submodule
->name
);
95 strbuf_addstr(&entry
, ".path");
96 if (git_config_set_in_file_gently(GITMODULES_FILE
, entry
.buf
, newpath
) < 0) {
97 /* Maybe the user already did that, don't error out here */
98 warning(_("Could not update .gitmodules entry %s"), entry
.buf
);
99 strbuf_release(&entry
);
102 strbuf_release(&entry
);
107 * Try to remove the "submodule.<name>" section from .gitmodules where the given
108 * path is configured. Return 0 only if a .gitmodules file was found, a section
109 * with the correct path=<path> setting was found and we could remove it.
111 int remove_path_from_gitmodules(const char *path
)
113 struct strbuf sect
= STRBUF_INIT
;
114 const struct submodule
*submodule
;
116 if (!file_exists(GITMODULES_FILE
)) /* Do nothing without .gitmodules */
119 if (is_gitmodules_unmerged(&the_index
))
120 die(_("Cannot change unmerged .gitmodules, resolve merge conflicts first"));
122 submodule
= submodule_from_path(&null_oid
, path
);
123 if (!submodule
|| !submodule
->name
) {
124 warning(_("Could not find section in .gitmodules where path=%s"), path
);
127 strbuf_addstr(§
, "submodule.");
128 strbuf_addstr(§
, submodule
->name
);
129 if (git_config_rename_section_in_file(GITMODULES_FILE
, sect
.buf
, NULL
) < 0) {
130 /* Maybe the user already did that, don't error out here */
131 warning(_("Could not remove .gitmodules entry for %s"), path
);
132 strbuf_release(§
);
135 strbuf_release(§
);
139 void stage_updated_gitmodules(void)
141 if (add_file_to_cache(GITMODULES_FILE
, 0))
142 die(_("staging updated .gitmodules failed"));
145 static int add_submodule_odb(const char *path
)
147 struct strbuf objects_directory
= STRBUF_INIT
;
150 ret
= strbuf_git_path_submodule(&objects_directory
, path
, "objects/");
153 if (!is_directory(objects_directory
.buf
)) {
157 add_to_alternates_memory(objects_directory
.buf
);
159 strbuf_release(&objects_directory
);
163 void set_diffopt_flags_from_submodule_config(struct diff_options
*diffopt
,
166 const struct submodule
*submodule
= submodule_from_path(&null_oid
, path
);
168 if (submodule
->ignore
)
169 handle_ignore_submodules_arg(diffopt
, submodule
->ignore
);
170 else if (is_gitmodules_unmerged(&the_index
))
171 DIFF_OPT_SET(diffopt
, IGNORE_SUBMODULES
);
175 /* For loading from the .gitmodules file. */
176 static int git_modules_config(const char *var
, const char *value
, void *cb
)
178 if (starts_with(var
, "submodule."))
179 return parse_submodule_config_option(var
, value
);
183 /* Loads all submodule settings from the config. */
184 int submodule_config(const char *var
, const char *value
, void *cb
)
186 if (!strcmp(var
, "submodule.recurse")) {
187 int v
= git_config_bool(var
, value
) ?
188 RECURSE_SUBMODULES_ON
: RECURSE_SUBMODULES_OFF
;
189 config_update_recurse_submodules
= v
;
192 return git_modules_config(var
, value
, cb
);
196 /* Cheap function that only determines if we're interested in submodules at all */
197 int git_default_submodule_config(const char *var
, const char *value
, void *cb
)
199 if (!strcmp(var
, "submodule.recurse")) {
200 int v
= git_config_bool(var
, value
) ?
201 RECURSE_SUBMODULES_ON
: RECURSE_SUBMODULES_OFF
;
202 config_update_recurse_submodules
= v
;
207 int option_parse_recurse_submodules_worktree_updater(const struct option
*opt
,
208 const char *arg
, int unset
)
211 config_update_recurse_submodules
= RECURSE_SUBMODULES_OFF
;
215 config_update_recurse_submodules
=
216 parse_update_recurse_submodules_arg(opt
->long_name
,
219 config_update_recurse_submodules
= RECURSE_SUBMODULES_ON
;
224 void load_submodule_cache(void)
226 if (config_update_recurse_submodules
== RECURSE_SUBMODULES_OFF
)
230 git_config(submodule_config
, NULL
);
233 static int gitmodules_cb(const char *var
, const char *value
, void *data
)
235 struct repository
*repo
= data
;
236 return submodule_config_option(repo
, var
, value
);
239 void repo_read_gitmodules(struct repository
*repo
)
241 if (repo
->worktree
) {
244 if (repo_read_index(repo
) < 0)
247 gitmodules
= repo_worktree_path(repo
, GITMODULES_FILE
);
249 if (!is_gitmodules_unmerged(repo
->index
))
250 git_config_from_file(gitmodules_cb
, gitmodules
, repo
);
256 void gitmodules_config(void)
258 repo_read_gitmodules(the_repository
);
261 void gitmodules_config_oid(const struct object_id
*commit_oid
)
263 struct strbuf rev
= STRBUF_INIT
;
264 struct object_id oid
;
266 if (gitmodule_oid_from_commit(commit_oid
, &oid
, &rev
)) {
267 git_config_from_blob_oid(submodule_config
, rev
.buf
,
270 strbuf_release(&rev
);
274 * Determine if a submodule has been initialized at a given 'path'
276 int is_submodule_active(struct repository
*repo
, const char *path
)
281 const struct string_list
*sl
;
282 const struct submodule
*module
;
284 module
= submodule_from_cache(repo
, &null_oid
, path
);
286 /* early return if there isn't a path->module mapping */
290 /* submodule.<name>.active is set */
291 key
= xstrfmt("submodule.%s.active", module
->name
);
292 if (!repo_config_get_bool(repo
, key
, &ret
)) {
298 /* submodule.active is set */
299 sl
= repo_config_get_value_multi(repo
, "submodule.active");
302 struct argv_array args
= ARGV_ARRAY_INIT
;
303 const struct string_list_item
*item
;
305 for_each_string_list_item(item
, sl
) {
306 argv_array_push(&args
, item
->string
);
309 parse_pathspec(&ps
, 0, 0, NULL
, args
.argv
);
310 ret
= match_pathspec(&ps
, path
, strlen(path
), 0, NULL
, 1);
312 argv_array_clear(&args
);
317 /* fallback to checking if the URL is set */
318 key
= xstrfmt("submodule.%s.url", module
->name
);
319 ret
= !repo_config_get_string(repo
, key
, &value
);
326 int is_submodule_populated_gently(const char *path
, int *return_error_code
)
329 char *gitdir
= xstrfmt("%s/.git", path
);
331 if (resolve_gitdir_gently(gitdir
, return_error_code
))
339 * Dies if the provided 'prefix' corresponds to an unpopulated submodule
341 void die_in_unpopulated_submodule(const struct index_state
*istate
,
349 prefixlen
= strlen(prefix
);
351 for (i
= 0; i
< istate
->cache_nr
; i
++) {
352 struct cache_entry
*ce
= istate
->cache
[i
];
353 int ce_len
= ce_namelen(ce
);
355 if (!S_ISGITLINK(ce
->ce_mode
))
357 if (prefixlen
<= ce_len
)
359 if (strncmp(ce
->name
, prefix
, ce_len
))
361 if (prefix
[ce_len
] != '/')
364 die(_("in unpopulated submodule '%s'"), ce
->name
);
369 * Dies if any paths in the provided pathspec descends into a submodule
371 void die_path_inside_submodule(const struct index_state
*istate
,
372 const struct pathspec
*ps
)
376 for (i
= 0; i
< istate
->cache_nr
; i
++) {
377 struct cache_entry
*ce
= istate
->cache
[i
];
378 int ce_len
= ce_namelen(ce
);
380 if (!S_ISGITLINK(ce
->ce_mode
))
383 for (j
= 0; j
< ps
->nr
; j
++) {
384 const struct pathspec_item
*item
= &ps
->items
[j
];
386 if (item
->len
<= ce_len
)
388 if (item
->match
[ce_len
] != '/')
390 if (strncmp(ce
->name
, item
->match
, ce_len
))
392 if (item
->len
== ce_len
+ 1)
395 die(_("Pathspec '%s' is in submodule '%.*s'"),
396 item
->original
, ce_len
, ce
->name
);
401 enum submodule_update_type
parse_submodule_update_type(const char *value
)
403 if (!strcmp(value
, "none"))
404 return SM_UPDATE_NONE
;
405 else if (!strcmp(value
, "checkout"))
406 return SM_UPDATE_CHECKOUT
;
407 else if (!strcmp(value
, "rebase"))
408 return SM_UPDATE_REBASE
;
409 else if (!strcmp(value
, "merge"))
410 return SM_UPDATE_MERGE
;
411 else if (*value
== '!')
412 return SM_UPDATE_COMMAND
;
414 return SM_UPDATE_UNSPECIFIED
;
417 int parse_submodule_update_strategy(const char *value
,
418 struct submodule_update_strategy
*dst
)
420 enum submodule_update_type type
;
422 free((void*)dst
->command
);
425 type
= parse_submodule_update_type(value
);
426 if (type
== SM_UPDATE_UNSPECIFIED
)
430 if (type
== SM_UPDATE_COMMAND
)
431 dst
->command
= xstrdup(value
+ 1);
436 const char *submodule_strategy_to_string(const struct submodule_update_strategy
*s
)
438 struct strbuf sb
= STRBUF_INIT
;
440 case SM_UPDATE_CHECKOUT
:
442 case SM_UPDATE_MERGE
:
444 case SM_UPDATE_REBASE
:
448 case SM_UPDATE_UNSPECIFIED
:
450 case SM_UPDATE_COMMAND
:
451 strbuf_addf(&sb
, "!%s", s
->command
);
452 return strbuf_detach(&sb
, NULL
);
457 void handle_ignore_submodules_arg(struct diff_options
*diffopt
,
460 DIFF_OPT_CLR(diffopt
, IGNORE_SUBMODULES
);
461 DIFF_OPT_CLR(diffopt
, IGNORE_UNTRACKED_IN_SUBMODULES
);
462 DIFF_OPT_CLR(diffopt
, IGNORE_DIRTY_SUBMODULES
);
464 if (!strcmp(arg
, "all"))
465 DIFF_OPT_SET(diffopt
, IGNORE_SUBMODULES
);
466 else if (!strcmp(arg
, "untracked"))
467 DIFF_OPT_SET(diffopt
, IGNORE_UNTRACKED_IN_SUBMODULES
);
468 else if (!strcmp(arg
, "dirty"))
469 DIFF_OPT_SET(diffopt
, IGNORE_DIRTY_SUBMODULES
);
470 else if (strcmp(arg
, "none"))
471 die("bad --ignore-submodules argument: %s", arg
);
474 static int prepare_submodule_summary(struct rev_info
*rev
, const char *path
,
475 struct commit
*left
, struct commit
*right
,
476 struct commit_list
*merge_bases
)
478 struct commit_list
*list
;
480 init_revisions(rev
, NULL
);
481 setup_revisions(0, NULL
, rev
, NULL
);
483 rev
->first_parent_only
= 1;
484 left
->object
.flags
|= SYMMETRIC_LEFT
;
485 add_pending_object(rev
, &left
->object
, path
);
486 add_pending_object(rev
, &right
->object
, path
);
487 for (list
= merge_bases
; list
; list
= list
->next
) {
488 list
->item
->object
.flags
|= UNINTERESTING
;
489 add_pending_object(rev
, &list
->item
->object
,
490 oid_to_hex(&list
->item
->object
.oid
));
492 return prepare_revision_walk(rev
);
495 static void print_submodule_summary(struct rev_info
*rev
, FILE *f
,
496 const char *line_prefix
,
497 const char *del
, const char *add
, const char *reset
)
499 static const char format
[] = " %m %s";
500 struct strbuf sb
= STRBUF_INIT
;
501 struct commit
*commit
;
503 while ((commit
= get_revision(rev
))) {
504 struct pretty_print_context ctx
= {0};
505 ctx
.date_mode
= rev
->date_mode
;
506 ctx
.output_encoding
= get_log_output_encoding();
507 strbuf_setlen(&sb
, 0);
508 strbuf_addstr(&sb
, line_prefix
);
509 if (commit
->object
.flags
& SYMMETRIC_LEFT
) {
511 strbuf_addstr(&sb
, del
);
514 strbuf_addstr(&sb
, add
);
515 format_commit_message(commit
, format
, &sb
, &ctx
);
517 strbuf_addstr(&sb
, reset
);
518 strbuf_addch(&sb
, '\n');
519 fprintf(f
, "%s", sb
.buf
);
524 static void prepare_submodule_repo_env_no_git_dir(struct argv_array
*out
)
526 const char * const *var
;
528 for (var
= local_repo_env
; *var
; var
++) {
529 if (strcmp(*var
, CONFIG_DATA_ENVIRONMENT
))
530 argv_array_push(out
, *var
);
534 void prepare_submodule_repo_env(struct argv_array
*out
)
536 prepare_submodule_repo_env_no_git_dir(out
);
537 argv_array_pushf(out
, "%s=%s", GIT_DIR_ENVIRONMENT
,
538 DEFAULT_GIT_DIR_ENVIRONMENT
);
541 /* Helper function to display the submodule header line prior to the full
542 * summary output. If it can locate the submodule objects directory it will
543 * attempt to lookup both the left and right commits and put them into the
544 * left and right pointers.
546 static void show_submodule_header(FILE *f
, const char *path
,
547 const char *line_prefix
,
548 struct object_id
*one
, struct object_id
*two
,
549 unsigned dirty_submodule
, const char *meta
,
551 struct commit
**left
, struct commit
**right
,
552 struct commit_list
**merge_bases
)
554 const char *message
= NULL
;
555 struct strbuf sb
= STRBUF_INIT
;
556 int fast_forward
= 0, fast_backward
= 0;
558 if (dirty_submodule
& DIRTY_SUBMODULE_UNTRACKED
)
559 fprintf(f
, "%sSubmodule %s contains untracked content\n",
561 if (dirty_submodule
& DIRTY_SUBMODULE_MODIFIED
)
562 fprintf(f
, "%sSubmodule %s contains modified content\n",
565 if (is_null_oid(one
))
566 message
= "(new submodule)";
567 else if (is_null_oid(two
))
568 message
= "(submodule deleted)";
570 if (add_submodule_odb(path
)) {
572 message
= "(not initialized)";
577 * Attempt to lookup the commit references, and determine if this is
578 * a fast forward or fast backwards update.
580 *left
= lookup_commit_reference(one
);
581 *right
= lookup_commit_reference(two
);
584 * Warn about missing commits in the submodule project, but only if
587 if ((!is_null_oid(one
) && !*left
) ||
588 (!is_null_oid(two
) && !*right
))
589 message
= "(commits not present)";
591 *merge_bases
= get_merge_bases(*left
, *right
);
593 if ((*merge_bases
)->item
== *left
)
595 else if ((*merge_bases
)->item
== *right
)
599 if (!oidcmp(one
, two
)) {
605 strbuf_addf(&sb
, "%s%sSubmodule %s ", line_prefix
, meta
, path
);
606 strbuf_add_unique_abbrev(&sb
, one
->hash
, DEFAULT_ABBREV
);
607 strbuf_addstr(&sb
, (fast_backward
|| fast_forward
) ? ".." : "...");
608 strbuf_add_unique_abbrev(&sb
, two
->hash
, DEFAULT_ABBREV
);
610 strbuf_addf(&sb
, " %s%s\n", message
, reset
);
612 strbuf_addf(&sb
, "%s:%s\n", fast_backward
? " (rewind)" : "", reset
);
613 fwrite(sb
.buf
, sb
.len
, 1, f
);
618 void show_submodule_summary(FILE *f
, const char *path
,
619 const char *line_prefix
,
620 struct object_id
*one
, struct object_id
*two
,
621 unsigned dirty_submodule
, const char *meta
,
622 const char *del
, const char *add
, const char *reset
)
625 struct commit
*left
= NULL
, *right
= NULL
;
626 struct commit_list
*merge_bases
= NULL
;
628 show_submodule_header(f
, path
, line_prefix
, one
, two
, dirty_submodule
,
629 meta
, reset
, &left
, &right
, &merge_bases
);
632 * If we don't have both a left and a right pointer, there is no
633 * reason to try and display a summary. The header line should contain
634 * all the information the user needs.
639 /* Treat revision walker failure the same as missing commits */
640 if (prepare_submodule_summary(&rev
, path
, left
, right
, merge_bases
)) {
641 fprintf(f
, "%s(revision walker failed)\n", line_prefix
);
645 print_submodule_summary(&rev
, f
, line_prefix
, del
, add
, reset
);
649 free_commit_list(merge_bases
);
650 clear_commit_marks(left
, ~0);
651 clear_commit_marks(right
, ~0);
654 void show_submodule_inline_diff(FILE *f
, const char *path
,
655 const char *line_prefix
,
656 struct object_id
*one
, struct object_id
*two
,
657 unsigned dirty_submodule
, const char *meta
,
658 const char *del
, const char *add
, const char *reset
,
659 const struct diff_options
*o
)
661 const struct object_id
*old
= &empty_tree_oid
, *new = &empty_tree_oid
;
662 struct commit
*left
= NULL
, *right
= NULL
;
663 struct commit_list
*merge_bases
= NULL
;
664 struct strbuf submodule_dir
= STRBUF_INIT
;
665 struct child_process cp
= CHILD_PROCESS_INIT
;
667 show_submodule_header(f
, path
, line_prefix
, one
, two
, dirty_submodule
,
668 meta
, reset
, &left
, &right
, &merge_bases
);
670 /* We need a valid left and right commit to display a difference */
671 if (!(left
|| is_null_oid(one
)) ||
672 !(right
|| is_null_oid(two
)))
683 cp
.out
= dup(fileno(f
));
686 /* TODO: other options may need to be passed here. */
687 argv_array_pushl(&cp
.args
, "diff", "--submodule=diff", NULL
);
689 argv_array_pushf(&cp
.args
, "--line-prefix=%s", line_prefix
);
690 if (DIFF_OPT_TST(o
, REVERSE_DIFF
)) {
691 argv_array_pushf(&cp
.args
, "--src-prefix=%s%s/",
693 argv_array_pushf(&cp
.args
, "--dst-prefix=%s%s/",
696 argv_array_pushf(&cp
.args
, "--src-prefix=%s%s/",
698 argv_array_pushf(&cp
.args
, "--dst-prefix=%s%s/",
701 argv_array_push(&cp
.args
, oid_to_hex(old
));
703 * If the submodule has modified content, we will diff against the
704 * work tree, under the assumption that the user has asked for the
705 * diff format and wishes to actually see all differences even if they
706 * haven't yet been committed to the submodule yet.
708 if (!(dirty_submodule
& DIRTY_SUBMODULE_MODIFIED
))
709 argv_array_push(&cp
.args
, oid_to_hex(new));
711 prepare_submodule_repo_env(&cp
.env_array
);
712 if (run_command(&cp
))
713 fprintf(f
, "(diff failed)\n");
716 strbuf_release(&submodule_dir
);
718 free_commit_list(merge_bases
);
720 clear_commit_marks(left
, ~0);
722 clear_commit_marks(right
, ~0);
725 int should_update_submodules(void)
727 return config_update_recurse_submodules
== RECURSE_SUBMODULES_ON
;
730 const struct submodule
*submodule_from_ce(const struct cache_entry
*ce
)
732 if (!S_ISGITLINK(ce
->ce_mode
))
735 if (!should_update_submodules())
738 return submodule_from_path(&null_oid
, ce
->name
);
741 static struct oid_array
*submodule_commits(struct string_list
*submodules
,
744 struct string_list_item
*item
;
746 item
= string_list_insert(submodules
, path
);
748 return (struct oid_array
*) item
->util
;
750 /* NEEDSWORK: should we have oid_array_init()? */
751 item
->util
= xcalloc(1, sizeof(struct oid_array
));
752 return (struct oid_array
*) item
->util
;
755 static void collect_changed_submodules_cb(struct diff_queue_struct
*q
,
756 struct diff_options
*options
,
760 struct string_list
*changed
= data
;
762 for (i
= 0; i
< q
->nr
; i
++) {
763 struct diff_filepair
*p
= q
->queue
[i
];
764 struct oid_array
*commits
;
765 if (!S_ISGITLINK(p
->two
->mode
))
768 if (S_ISGITLINK(p
->one
->mode
)) {
770 * NEEDSWORK: We should honor the name configured in
771 * the .gitmodules file of the commit we are examining
772 * here to be able to correctly follow submodules
773 * being moved around.
775 commits
= submodule_commits(changed
, p
->two
->path
);
776 oid_array_append(commits
, &p
->two
->oid
);
778 /* Submodule is new or was moved here */
780 * NEEDSWORK: When the .git directories of submodules
781 * live inside the superprojects .git directory some
782 * day we should fetch new submodules directly into
783 * that location too when config or options request
784 * that so they can be checked out from there.
792 * Collect the paths of submodules in 'changed' which have changed based on
793 * the revisions as specified in 'argv'. Each entry in 'changed' will also
794 * have a corresponding 'struct oid_array' (in the 'util' field) which lists
795 * what the submodule pointers were updated to during the change.
797 static void collect_changed_submodules(struct string_list
*changed
,
798 struct argv_array
*argv
)
801 const struct commit
*commit
;
803 init_revisions(&rev
, NULL
);
804 setup_revisions(argv
->argc
, argv
->argv
, &rev
, NULL
);
805 if (prepare_revision_walk(&rev
))
806 die("revision walk setup failed");
808 while ((commit
= get_revision(&rev
))) {
809 struct rev_info diff_rev
;
811 init_revisions(&diff_rev
, NULL
);
812 diff_rev
.diffopt
.output_format
|= DIFF_FORMAT_CALLBACK
;
813 diff_rev
.diffopt
.format_callback
= collect_changed_submodules_cb
;
814 diff_rev
.diffopt
.format_callback_data
= changed
;
815 diff_tree_combined_merge(commit
, 1, &diff_rev
);
818 reset_revision_walk();
821 static void free_submodules_oids(struct string_list
*submodules
)
823 struct string_list_item
*item
;
824 for_each_string_list_item(item
, submodules
)
825 oid_array_clear((struct oid_array
*) item
->util
);
826 string_list_clear(submodules
, 1);
829 static int has_remote(const char *refname
, const struct object_id
*oid
,
830 int flags
, void *cb_data
)
835 static int append_oid_to_argv(const struct object_id
*oid
, void *data
)
837 struct argv_array
*argv
= data
;
838 argv_array_push(argv
, oid_to_hex(oid
));
842 static int check_has_commit(const struct object_id
*oid
, void *data
)
844 int *has_commit
= data
;
846 if (!lookup_commit_reference(oid
))
852 static int submodule_has_commits(const char *path
, struct oid_array
*commits
)
857 * Perform a cheap, but incorrect check for the existence of 'commits'.
858 * This is done by adding the submodule's object store to the in-core
859 * object store, and then querying for each commit's existence. If we
860 * do not have the commit object anywhere, there is no chance we have
861 * it in the object store of the correct submodule and have it
862 * reachable from a ref, so we can fail early without spawning rev-list
863 * which is expensive.
865 if (add_submodule_odb(path
))
868 oid_array_for_each_unique(commits
, check_has_commit
, &has_commit
);
872 * Even if the submodule is checked out and the commit is
873 * present, make sure it exists in the submodule's object store
874 * and that it is reachable from a ref.
876 struct child_process cp
= CHILD_PROCESS_INIT
;
877 struct strbuf out
= STRBUF_INIT
;
879 argv_array_pushl(&cp
.args
, "rev-list", "-n", "1", NULL
);
880 oid_array_for_each_unique(commits
, append_oid_to_argv
, &cp
.args
);
881 argv_array_pushl(&cp
.args
, "--not", "--all", NULL
);
883 prepare_submodule_repo_env(&cp
.env_array
);
888 if (capture_command(&cp
, &out
, GIT_MAX_HEXSZ
+ 1) || out
.len
)
891 strbuf_release(&out
);
897 static int submodule_needs_pushing(const char *path
, struct oid_array
*commits
)
899 if (!submodule_has_commits(path
, commits
))
901 * NOTE: We do consider it safe to return "no" here. The
902 * correct answer would be "We do not know" instead of
903 * "No push needed", but it is quite hard to change
904 * the submodule pointer without having the submodule
905 * around. If a user did however change the submodules
906 * without having the submodule around, this indicates
907 * an expert who knows what they are doing or a
908 * maintainer integrating work from other people. In
909 * both cases it should be safe to skip this check.
913 if (for_each_remote_ref_submodule(path
, has_remote
, NULL
) > 0) {
914 struct child_process cp
= CHILD_PROCESS_INIT
;
915 struct strbuf buf
= STRBUF_INIT
;
916 int needs_pushing
= 0;
918 argv_array_push(&cp
.args
, "rev-list");
919 oid_array_for_each_unique(commits
, append_oid_to_argv
, &cp
.args
);
920 argv_array_pushl(&cp
.args
, "--not", "--remotes", "-n", "1" , NULL
);
922 prepare_submodule_repo_env(&cp
.env_array
);
927 if (start_command(&cp
))
928 die("Could not run 'git rev-list <commits> --not --remotes -n 1' command in submodule %s",
930 if (strbuf_read(&buf
, cp
.out
, 41))
934 strbuf_release(&buf
);
935 return needs_pushing
;
941 int find_unpushed_submodules(struct oid_array
*commits
,
942 const char *remotes_name
, struct string_list
*needs_pushing
)
944 struct string_list submodules
= STRING_LIST_INIT_DUP
;
945 struct string_list_item
*submodule
;
946 struct argv_array argv
= ARGV_ARRAY_INIT
;
948 /* argv.argv[0] will be ignored by setup_revisions */
949 argv_array_push(&argv
, "find_unpushed_submodules");
950 oid_array_for_each_unique(commits
, append_oid_to_argv
, &argv
);
951 argv_array_push(&argv
, "--not");
952 argv_array_pushf(&argv
, "--remotes=%s", remotes_name
);
954 collect_changed_submodules(&submodules
, &argv
);
956 for_each_string_list_item(submodule
, &submodules
) {
957 struct oid_array
*commits
= submodule
->util
;
958 const char *path
= submodule
->string
;
960 if (submodule_needs_pushing(path
, commits
))
961 string_list_insert(needs_pushing
, path
);
964 free_submodules_oids(&submodules
);
965 argv_array_clear(&argv
);
967 return needs_pushing
->nr
;
970 static int push_submodule(const char *path
,
971 const struct remote
*remote
,
972 const char **refspec
, int refspec_nr
,
973 const struct string_list
*push_options
,
976 if (add_submodule_odb(path
))
979 if (for_each_remote_ref_submodule(path
, has_remote
, NULL
) > 0) {
980 struct child_process cp
= CHILD_PROCESS_INIT
;
981 argv_array_push(&cp
.args
, "push");
983 argv_array_push(&cp
.args
, "--dry-run");
985 if (push_options
&& push_options
->nr
) {
986 const struct string_list_item
*item
;
987 for_each_string_list_item(item
, push_options
)
988 argv_array_pushf(&cp
.args
, "--push-option=%s",
992 if (remote
->origin
!= REMOTE_UNCONFIGURED
) {
994 argv_array_push(&cp
.args
, remote
->name
);
995 for (i
= 0; i
< refspec_nr
; i
++)
996 argv_array_push(&cp
.args
, refspec
[i
]);
999 prepare_submodule_repo_env(&cp
.env_array
);
1003 if (run_command(&cp
))
1012 * Perform a check in the submodule to see if the remote and refspec work.
1013 * Die if the submodule can't be pushed.
1015 static void submodule_push_check(const char *path
, const struct remote
*remote
,
1016 const char **refspec
, int refspec_nr
)
1018 struct child_process cp
= CHILD_PROCESS_INIT
;
1021 argv_array_push(&cp
.args
, "submodule--helper");
1022 argv_array_push(&cp
.args
, "push-check");
1023 argv_array_push(&cp
.args
, remote
->name
);
1025 for (i
= 0; i
< refspec_nr
; i
++)
1026 argv_array_push(&cp
.args
, refspec
[i
]);
1028 prepare_submodule_repo_env(&cp
.env_array
);
1035 * Simply indicate if 'submodule--helper push-check' failed.
1036 * More detailed error information will be provided by the
1039 if (run_command(&cp
))
1040 die("process for submodule '%s' failed", path
);
1043 int push_unpushed_submodules(struct oid_array
*commits
,
1044 const struct remote
*remote
,
1045 const char **refspec
, int refspec_nr
,
1046 const struct string_list
*push_options
,
1050 struct string_list needs_pushing
= STRING_LIST_INIT_DUP
;
1052 if (!find_unpushed_submodules(commits
, remote
->name
, &needs_pushing
))
1056 * Verify that the remote and refspec can be propagated to all
1057 * submodules. This check can be skipped if the remote and refspec
1058 * won't be propagated due to the remote being unconfigured (e.g. a URL
1059 * instead of a remote name).
1061 if (remote
->origin
!= REMOTE_UNCONFIGURED
)
1062 for (i
= 0; i
< needs_pushing
.nr
; i
++)
1063 submodule_push_check(needs_pushing
.items
[i
].string
,
1064 remote
, refspec
, refspec_nr
);
1066 /* Actually push the submodules */
1067 for (i
= 0; i
< needs_pushing
.nr
; i
++) {
1068 const char *path
= needs_pushing
.items
[i
].string
;
1069 fprintf(stderr
, "Pushing submodule '%s'\n", path
);
1070 if (!push_submodule(path
, remote
, refspec
, refspec_nr
,
1071 push_options
, dry_run
)) {
1072 fprintf(stderr
, "Unable to push submodule '%s'\n", path
);
1077 string_list_clear(&needs_pushing
, 0);
1082 static int append_oid_to_array(const char *ref
, const struct object_id
*oid
,
1083 int flags
, void *data
)
1085 struct oid_array
*array
= data
;
1086 oid_array_append(array
, oid
);
1090 void check_for_new_submodule_commits(struct object_id
*oid
)
1092 if (!initialized_fetch_ref_tips
) {
1093 for_each_ref(append_oid_to_array
, &ref_tips_before_fetch
);
1094 initialized_fetch_ref_tips
= 1;
1097 oid_array_append(&ref_tips_after_fetch
, oid
);
1100 static void calculate_changed_submodule_paths(void)
1102 struct argv_array argv
= ARGV_ARRAY_INIT
;
1103 struct string_list changed_submodules
= STRING_LIST_INIT_DUP
;
1104 const struct string_list_item
*item
;
1106 /* No need to check if there are no submodules configured */
1107 if (!submodule_from_path(NULL
, NULL
))
1110 argv_array_push(&argv
, "--"); /* argv[0] program name */
1111 oid_array_for_each_unique(&ref_tips_after_fetch
,
1112 append_oid_to_argv
, &argv
);
1113 argv_array_push(&argv
, "--not");
1114 oid_array_for_each_unique(&ref_tips_before_fetch
,
1115 append_oid_to_argv
, &argv
);
1118 * Collect all submodules (whether checked out or not) for which new
1119 * commits have been recorded upstream in "changed_submodule_paths".
1121 collect_changed_submodules(&changed_submodules
, &argv
);
1123 for_each_string_list_item(item
, &changed_submodules
) {
1124 struct oid_array
*commits
= item
->util
;
1125 const char *path
= item
->string
;
1127 if (!submodule_has_commits(path
, commits
))
1128 string_list_append(&changed_submodule_paths
, path
);
1131 free_submodules_oids(&changed_submodules
);
1132 argv_array_clear(&argv
);
1133 oid_array_clear(&ref_tips_before_fetch
);
1134 oid_array_clear(&ref_tips_after_fetch
);
1135 initialized_fetch_ref_tips
= 0;
1138 int submodule_touches_in_range(struct object_id
*excl_oid
,
1139 struct object_id
*incl_oid
)
1141 struct string_list subs
= STRING_LIST_INIT_DUP
;
1142 struct argv_array args
= ARGV_ARRAY_INIT
;
1145 gitmodules_config();
1146 /* No need to check if there are no submodules configured */
1147 if (!submodule_from_path(NULL
, NULL
))
1150 argv_array_push(&args
, "--"); /* args[0] program name */
1151 argv_array_push(&args
, oid_to_hex(incl_oid
));
1152 argv_array_push(&args
, "--not");
1153 argv_array_push(&args
, oid_to_hex(excl_oid
));
1155 collect_changed_submodules(&subs
, &args
);
1158 argv_array_clear(&args
);
1160 free_submodules_oids(&subs
);
1164 struct submodule_parallel_fetch
{
1166 struct argv_array args
;
1167 const char *work_tree
;
1169 int command_line_option
;
1174 #define SPF_INIT {0, ARGV_ARRAY_INIT, NULL, NULL, 0, 0, 0, 0}
1176 static int get_next_submodule(struct child_process
*cp
,
1177 struct strbuf
*err
, void *data
, void **task_cb
)
1180 struct submodule_parallel_fetch
*spf
= data
;
1182 for (; spf
->count
< active_nr
; spf
->count
++) {
1183 struct strbuf submodule_path
= STRBUF_INIT
;
1184 struct strbuf submodule_git_dir
= STRBUF_INIT
;
1185 struct strbuf submodule_prefix
= STRBUF_INIT
;
1186 const struct cache_entry
*ce
= active_cache
[spf
->count
];
1187 const char *git_dir
, *default_argv
;
1188 const struct submodule
*submodule
;
1190 if (!S_ISGITLINK(ce
->ce_mode
))
1193 submodule
= submodule_from_path(&null_oid
, ce
->name
);
1195 default_argv
= "yes";
1196 if (spf
->command_line_option
== RECURSE_SUBMODULES_DEFAULT
) {
1197 int fetch_recurse
= RECURSE_SUBMODULES_NONE
;
1203 fetch_recurse
= submodule
->fetch_recurse
;
1204 key
= xstrfmt("submodule.%s.fetchRecurseSubmodules", submodule
->name
);
1205 if (!repo_config_get_string_const(the_repository
, key
, &value
)) {
1206 fetch_recurse
= parse_fetch_recurse_submodules_arg(key
, value
);
1211 if (fetch_recurse
!= RECURSE_SUBMODULES_NONE
) {
1212 if (fetch_recurse
== RECURSE_SUBMODULES_OFF
)
1214 if (fetch_recurse
== RECURSE_SUBMODULES_ON_DEMAND
) {
1215 if (!unsorted_string_list_lookup(&changed_submodule_paths
, ce
->name
))
1217 default_argv
= "on-demand";
1220 if (spf
->default_option
== RECURSE_SUBMODULES_OFF
)
1222 if (spf
->default_option
== RECURSE_SUBMODULES_ON_DEMAND
) {
1223 if (!unsorted_string_list_lookup(&changed_submodule_paths
, ce
->name
))
1225 default_argv
= "on-demand";
1228 } else if (spf
->command_line_option
== RECURSE_SUBMODULES_ON_DEMAND
) {
1229 if (!unsorted_string_list_lookup(&changed_submodule_paths
, ce
->name
))
1231 default_argv
= "on-demand";
1234 strbuf_addf(&submodule_path
, "%s/%s", spf
->work_tree
, ce
->name
);
1235 strbuf_addf(&submodule_git_dir
, "%s/.git", submodule_path
.buf
);
1236 strbuf_addf(&submodule_prefix
, "%s%s/", spf
->prefix
, ce
->name
);
1237 git_dir
= read_gitfile(submodule_git_dir
.buf
);
1239 git_dir
= submodule_git_dir
.buf
;
1240 if (is_directory(git_dir
)) {
1241 child_process_init(cp
);
1242 cp
->dir
= strbuf_detach(&submodule_path
, NULL
);
1243 prepare_submodule_repo_env(&cp
->env_array
);
1246 strbuf_addf(err
, "Fetching submodule %s%s\n",
1247 spf
->prefix
, ce
->name
);
1248 argv_array_init(&cp
->args
);
1249 argv_array_pushv(&cp
->args
, spf
->args
.argv
);
1250 argv_array_push(&cp
->args
, default_argv
);
1251 argv_array_push(&cp
->args
, "--submodule-prefix");
1252 argv_array_push(&cp
->args
, submodule_prefix
.buf
);
1255 strbuf_release(&submodule_path
);
1256 strbuf_release(&submodule_git_dir
);
1257 strbuf_release(&submodule_prefix
);
1266 static int fetch_start_failure(struct strbuf
*err
,
1267 void *cb
, void *task_cb
)
1269 struct submodule_parallel_fetch
*spf
= cb
;
1276 static int fetch_finish(int retvalue
, struct strbuf
*err
,
1277 void *cb
, void *task_cb
)
1279 struct submodule_parallel_fetch
*spf
= cb
;
1287 int fetch_populated_submodules(const struct argv_array
*options
,
1288 const char *prefix
, int command_line_option
,
1290 int quiet
, int max_parallel_jobs
)
1293 struct submodule_parallel_fetch spf
= SPF_INIT
;
1295 spf
.work_tree
= get_git_work_tree();
1296 spf
.command_line_option
= command_line_option
;
1297 spf
.default_option
= default_option
;
1299 spf
.prefix
= prefix
;
1304 if (read_cache() < 0)
1305 die("index file corrupt");
1307 argv_array_push(&spf
.args
, "fetch");
1308 for (i
= 0; i
< options
->argc
; i
++)
1309 argv_array_push(&spf
.args
, options
->argv
[i
]);
1310 argv_array_push(&spf
.args
, "--recurse-submodules-default");
1311 /* default value, "--submodule-prefix" and its value are added later */
1313 calculate_changed_submodule_paths();
1314 run_processes_parallel(max_parallel_jobs
,
1316 fetch_start_failure
,
1320 argv_array_clear(&spf
.args
);
1322 string_list_clear(&changed_submodule_paths
, 1);
1326 unsigned is_submodule_modified(const char *path
, int ignore_untracked
)
1328 struct child_process cp
= CHILD_PROCESS_INIT
;
1329 struct strbuf buf
= STRBUF_INIT
;
1331 unsigned dirty_submodule
= 0;
1332 const char *git_dir
;
1333 int ignore_cp_exit_code
= 0;
1335 strbuf_addf(&buf
, "%s/.git", path
);
1336 git_dir
= read_gitfile(buf
.buf
);
1339 if (!is_git_directory(git_dir
)) {
1340 if (is_directory(git_dir
))
1341 die(_("'%s' not recognized as a git repository"), git_dir
);
1342 strbuf_release(&buf
);
1343 /* The submodule is not checked out, so it is not modified */
1348 argv_array_pushl(&cp
.args
, "status", "--porcelain=2", NULL
);
1349 if (ignore_untracked
)
1350 argv_array_push(&cp
.args
, "-uno");
1352 prepare_submodule_repo_env(&cp
.env_array
);
1357 if (start_command(&cp
))
1358 die("Could not run 'git status --porcelain=2' in submodule %s", path
);
1360 fp
= xfdopen(cp
.out
, "r");
1361 while (strbuf_getwholeline(&buf
, fp
, '\n') != EOF
) {
1362 /* regular untracked files */
1363 if (buf
.buf
[0] == '?')
1364 dirty_submodule
|= DIRTY_SUBMODULE_UNTRACKED
;
1366 if (buf
.buf
[0] == 'u' ||
1367 buf
.buf
[0] == '1' ||
1368 buf
.buf
[0] == '2') {
1369 /* T = line type, XY = status, SSSS = submodule state */
1370 if (buf
.len
< strlen("T XY SSSS"))
1371 die("BUG: invalid status --porcelain=2 line %s",
1374 if (buf
.buf
[5] == 'S' && buf
.buf
[8] == 'U')
1375 /* nested untracked file */
1376 dirty_submodule
|= DIRTY_SUBMODULE_UNTRACKED
;
1378 if (buf
.buf
[0] == 'u' ||
1379 buf
.buf
[0] == '2' ||
1380 memcmp(buf
.buf
+ 5, "S..U", 4))
1382 dirty_submodule
|= DIRTY_SUBMODULE_MODIFIED
;
1385 if ((dirty_submodule
& DIRTY_SUBMODULE_MODIFIED
) &&
1386 ((dirty_submodule
& DIRTY_SUBMODULE_UNTRACKED
) ||
1387 ignore_untracked
)) {
1389 * We're not interested in any further information from
1390 * the child any more, neither output nor its exit code.
1392 ignore_cp_exit_code
= 1;
1398 if (finish_command(&cp
) && !ignore_cp_exit_code
)
1399 die("'git status --porcelain=2' failed in submodule %s", path
);
1401 strbuf_release(&buf
);
1402 return dirty_submodule
;
1405 int submodule_uses_gitfile(const char *path
)
1407 struct child_process cp
= CHILD_PROCESS_INIT
;
1408 const char *argv
[] = {
1416 struct strbuf buf
= STRBUF_INIT
;
1417 const char *git_dir
;
1419 strbuf_addf(&buf
, "%s/.git", path
);
1420 git_dir
= read_gitfile(buf
.buf
);
1422 strbuf_release(&buf
);
1425 strbuf_release(&buf
);
1427 /* Now test that all nested submodules use a gitfile too */
1429 prepare_submodule_repo_env(&cp
.env_array
);
1435 if (run_command(&cp
))
1442 * Check if it is a bad idea to remove a submodule, i.e. if we'd lose data
1445 * Return 1 if we'd lose data, return 0 if the removal is fine,
1446 * and negative values for errors.
1448 int bad_to_remove_submodule(const char *path
, unsigned flags
)
1451 struct child_process cp
= CHILD_PROCESS_INIT
;
1452 struct strbuf buf
= STRBUF_INIT
;
1455 if (!file_exists(path
) || is_empty_dir(path
))
1458 if (!submodule_uses_gitfile(path
))
1461 argv_array_pushl(&cp
.args
, "status", "--porcelain",
1462 "--ignore-submodules=none", NULL
);
1464 if (flags
& SUBMODULE_REMOVAL_IGNORE_UNTRACKED
)
1465 argv_array_push(&cp
.args
, "-uno");
1467 argv_array_push(&cp
.args
, "-uall");
1469 if (!(flags
& SUBMODULE_REMOVAL_IGNORE_IGNORED_UNTRACKED
))
1470 argv_array_push(&cp
.args
, "--ignored");
1472 prepare_submodule_repo_env(&cp
.env_array
);
1477 if (start_command(&cp
)) {
1478 if (flags
& SUBMODULE_REMOVAL_DIE_ON_ERROR
)
1479 die(_("could not start 'git status' in submodule '%s'"),
1485 len
= strbuf_read(&buf
, cp
.out
, 1024);
1490 if (finish_command(&cp
)) {
1491 if (flags
& SUBMODULE_REMOVAL_DIE_ON_ERROR
)
1492 die(_("could not run 'git status' in submodule '%s'"),
1497 strbuf_release(&buf
);
1501 static const char *get_super_prefix_or_empty(void)
1503 const char *s
= get_super_prefix();
1509 static int submodule_has_dirty_index(const struct submodule
*sub
)
1511 struct child_process cp
= CHILD_PROCESS_INIT
;
1513 prepare_submodule_repo_env(&cp
.env_array
);
1516 argv_array_pushl(&cp
.args
, "diff-index", "--quiet",
1517 "--cached", "HEAD", NULL
);
1521 if (start_command(&cp
))
1522 die("could not recurse into submodule '%s'", sub
->path
);
1524 return finish_command(&cp
);
1527 static void submodule_reset_index(const char *path
)
1529 struct child_process cp
= CHILD_PROCESS_INIT
;
1530 prepare_submodule_repo_env(&cp
.env_array
);
1536 argv_array_pushf(&cp
.args
, "--super-prefix=%s%s/",
1537 get_super_prefix_or_empty(), path
);
1538 argv_array_pushl(&cp
.args
, "read-tree", "-u", "--reset", NULL
);
1540 argv_array_push(&cp
.args
, EMPTY_TREE_SHA1_HEX
);
1542 if (run_command(&cp
))
1543 die("could not reset submodule index");
1547 * Moves a submodule at a given path from a given head to another new head.
1548 * For edge cases (a submodule coming into existence or removing a submodule)
1549 * pass NULL for old or new respectively.
1551 int submodule_move_head(const char *path
,
1557 struct child_process cp
= CHILD_PROCESS_INIT
;
1558 const struct submodule
*sub
;
1559 int *error_code_ptr
, error_code
;
1561 if (!is_submodule_active(the_repository
, path
))
1564 if (flags
& SUBMODULE_MOVE_HEAD_FORCE
)
1566 * Pass non NULL pointer to is_submodule_populated_gently
1567 * to prevent die()-ing. We'll use connect_work_tree_and_git_dir
1568 * to fixup the submodule in the force case later.
1570 error_code_ptr
= &error_code
;
1572 error_code_ptr
= NULL
;
1574 if (old
&& !is_submodule_populated_gently(path
, error_code_ptr
))
1577 sub
= submodule_from_path(&null_oid
, path
);
1580 die("BUG: could not get submodule information for '%s'", path
);
1582 if (old
&& !(flags
& SUBMODULE_MOVE_HEAD_FORCE
)) {
1583 /* Check if the submodule has a dirty index. */
1584 if (submodule_has_dirty_index(sub
))
1585 return error(_("submodule '%s' has dirty index"), path
);
1588 if (!(flags
& SUBMODULE_MOVE_HEAD_DRY_RUN
)) {
1590 if (!submodule_uses_gitfile(path
))
1591 absorb_git_dir_into_superproject("", path
,
1592 ABSORB_GITDIR_RECURSE_SUBMODULES
);
1594 char *gitdir
= xstrfmt("%s/modules/%s",
1595 get_git_common_dir(), sub
->name
);
1596 connect_work_tree_and_git_dir(path
, gitdir
);
1599 /* make sure the index is clean as well */
1600 submodule_reset_index(path
);
1603 if (old
&& (flags
& SUBMODULE_MOVE_HEAD_FORCE
)) {
1604 char *gitdir
= xstrfmt("%s/modules/%s",
1605 get_git_common_dir(), sub
->name
);
1606 connect_work_tree_and_git_dir(path
, gitdir
);
1611 prepare_submodule_repo_env(&cp
.env_array
);
1617 argv_array_pushf(&cp
.args
, "--super-prefix=%s%s/",
1618 get_super_prefix_or_empty(), path
);
1619 argv_array_pushl(&cp
.args
, "read-tree", "--recurse-submodules", NULL
);
1621 if (flags
& SUBMODULE_MOVE_HEAD_DRY_RUN
)
1622 argv_array_push(&cp
.args
, "-n");
1624 argv_array_push(&cp
.args
, "-u");
1626 if (flags
& SUBMODULE_MOVE_HEAD_FORCE
)
1627 argv_array_push(&cp
.args
, "--reset");
1629 argv_array_push(&cp
.args
, "-m");
1631 argv_array_push(&cp
.args
, old
? old
: EMPTY_TREE_SHA1_HEX
);
1632 argv_array_push(&cp
.args
, new ? new : EMPTY_TREE_SHA1_HEX
);
1634 if (run_command(&cp
)) {
1639 if (!(flags
& SUBMODULE_MOVE_HEAD_DRY_RUN
)) {
1641 child_process_init(&cp
);
1642 /* also set the HEAD accordingly */
1647 prepare_submodule_repo_env(&cp
.env_array
);
1648 argv_array_pushl(&cp
.args
, "update-ref", "HEAD", new, NULL
);
1650 if (run_command(&cp
)) {
1655 struct strbuf sb
= STRBUF_INIT
;
1657 strbuf_addf(&sb
, "%s/.git", path
);
1658 unlink_or_warn(sb
.buf
);
1659 strbuf_release(&sb
);
1661 if (is_empty_dir(path
))
1662 rmdir_or_warn(path
);
1669 static int find_first_merges(struct object_array
*result
, const char *path
,
1670 struct commit
*a
, struct commit
*b
)
1673 struct object_array merges
= OBJECT_ARRAY_INIT
;
1674 struct commit
*commit
;
1675 int contains_another
;
1677 char merged_revision
[42];
1678 const char *rev_args
[] = { "rev-list", "--merges", "--ancestry-path",
1679 "--all", merged_revision
, NULL
};
1680 struct rev_info revs
;
1681 struct setup_revision_opt rev_opts
;
1683 memset(result
, 0, sizeof(struct object_array
));
1684 memset(&rev_opts
, 0, sizeof(rev_opts
));
1686 /* get all revisions that merge commit a */
1687 xsnprintf(merged_revision
, sizeof(merged_revision
), "^%s",
1688 oid_to_hex(&a
->object
.oid
));
1689 init_revisions(&revs
, NULL
);
1690 rev_opts
.submodule
= path
;
1691 setup_revisions(ARRAY_SIZE(rev_args
)-1, rev_args
, &revs
, &rev_opts
);
1693 /* save all revisions from the above list that contain b */
1694 if (prepare_revision_walk(&revs
))
1695 die("revision walk setup failed");
1696 while ((commit
= get_revision(&revs
)) != NULL
) {
1697 struct object
*o
= &(commit
->object
);
1698 if (in_merge_bases(b
, commit
))
1699 add_object_array(o
, NULL
, &merges
);
1701 reset_revision_walk();
1703 /* Now we've got all merges that contain a and b. Prune all
1704 * merges that contain another found merge and save them in
1707 for (i
= 0; i
< merges
.nr
; i
++) {
1708 struct commit
*m1
= (struct commit
*) merges
.objects
[i
].item
;
1710 contains_another
= 0;
1711 for (j
= 0; j
< merges
.nr
; j
++) {
1712 struct commit
*m2
= (struct commit
*) merges
.objects
[j
].item
;
1713 if (i
!= j
&& in_merge_bases(m2
, m1
)) {
1714 contains_another
= 1;
1719 if (!contains_another
)
1720 add_object_array(merges
.objects
[i
].item
, NULL
, result
);
1723 free(merges
.objects
);
1727 static void print_commit(struct commit
*commit
)
1729 struct strbuf sb
= STRBUF_INIT
;
1730 struct pretty_print_context ctx
= {0};
1731 ctx
.date_mode
.type
= DATE_NORMAL
;
1732 format_commit_message(commit
, " %h: %m %s", &sb
, &ctx
);
1733 fprintf(stderr
, "%s\n", sb
.buf
);
1734 strbuf_release(&sb
);
1737 #define MERGE_WARNING(path, msg) \
1738 warning("Failed to merge submodule %s (%s)", path, msg);
1740 int merge_submodule(struct object_id
*result
, const char *path
,
1741 const struct object_id
*base
, const struct object_id
*a
,
1742 const struct object_id
*b
, int search
)
1744 struct commit
*commit_base
, *commit_a
, *commit_b
;
1746 struct object_array merges
;
1750 /* store a in result in case we fail */
1753 /* we can not handle deletion conflicts */
1754 if (is_null_oid(base
))
1761 if (add_submodule_odb(path
)) {
1762 MERGE_WARNING(path
, "not checked out");
1766 if (!(commit_base
= lookup_commit_reference(base
)) ||
1767 !(commit_a
= lookup_commit_reference(a
)) ||
1768 !(commit_b
= lookup_commit_reference(b
))) {
1769 MERGE_WARNING(path
, "commits not present");
1773 /* check whether both changes are forward */
1774 if (!in_merge_bases(commit_base
, commit_a
) ||
1775 !in_merge_bases(commit_base
, commit_b
)) {
1776 MERGE_WARNING(path
, "commits don't follow merge-base");
1780 /* Case #1: a is contained in b or vice versa */
1781 if (in_merge_bases(commit_a
, commit_b
)) {
1785 if (in_merge_bases(commit_b
, commit_a
)) {
1791 * Case #2: There are one or more merges that contain a and b in
1792 * the submodule. If there is only one, then present it as a
1793 * suggestion to the user, but leave it marked unmerged so the
1794 * user needs to confirm the resolution.
1797 /* Skip the search if makes no sense to the calling context. */
1801 /* find commit which merges them */
1802 parent_count
= find_first_merges(&merges
, path
, commit_a
, commit_b
);
1803 switch (parent_count
) {
1805 MERGE_WARNING(path
, "merge following commits not found");
1809 MERGE_WARNING(path
, "not fast-forward");
1810 fprintf(stderr
, "Found a possible merge resolution "
1811 "for the submodule:\n");
1812 print_commit((struct commit
*) merges
.objects
[0].item
);
1814 "If this is correct simply add it to the index "
1817 " git update-index --cacheinfo 160000 %s \"%s\"\n\n"
1818 "which will accept this suggestion.\n",
1819 oid_to_hex(&merges
.objects
[0].item
->oid
), path
);
1823 MERGE_WARNING(path
, "multiple merges found");
1824 for (i
= 0; i
< merges
.nr
; i
++)
1825 print_commit((struct commit
*) merges
.objects
[i
].item
);
1828 free(merges
.objects
);
1833 * Embeds a single submodules git directory into the superprojects git dir,
1836 static void relocate_single_git_dir_into_superproject(const char *prefix
,
1839 char *old_git_dir
= NULL
, *real_old_git_dir
= NULL
, *real_new_git_dir
= NULL
;
1840 const char *new_git_dir
;
1841 const struct submodule
*sub
;
1843 if (submodule_uses_worktrees(path
))
1844 die(_("relocate_gitdir for submodule '%s' with "
1845 "more than one worktree not supported"), path
);
1847 old_git_dir
= xstrfmt("%s/.git", path
);
1848 if (read_gitfile(old_git_dir
))
1849 /* If it is an actual gitfile, it doesn't need migration. */
1852 real_old_git_dir
= real_pathdup(old_git_dir
, 1);
1854 sub
= submodule_from_path(&null_oid
, path
);
1856 die(_("could not lookup name for submodule '%s'"), path
);
1858 new_git_dir
= git_path("modules/%s", sub
->name
);
1859 if (safe_create_leading_directories_const(new_git_dir
) < 0)
1860 die(_("could not create directory '%s'"), new_git_dir
);
1861 real_new_git_dir
= real_pathdup(new_git_dir
, 1);
1863 fprintf(stderr
, _("Migrating git directory of '%s%s' from\n'%s' to\n'%s'\n"),
1864 get_super_prefix_or_empty(), path
,
1865 real_old_git_dir
, real_new_git_dir
);
1867 relocate_gitdir(path
, real_old_git_dir
, real_new_git_dir
);
1870 free(real_old_git_dir
);
1871 free(real_new_git_dir
);
1875 * Migrate the git directory of the submodule given by path from
1876 * having its git directory within the working tree to the git dir nested
1877 * in its superprojects git dir under modules/.
1879 void absorb_git_dir_into_superproject(const char *prefix
,
1884 const char *sub_git_dir
;
1885 struct strbuf gitdir
= STRBUF_INIT
;
1886 strbuf_addf(&gitdir
, "%s/.git", path
);
1887 sub_git_dir
= resolve_gitdir_gently(gitdir
.buf
, &err_code
);
1889 /* Not populated? */
1891 const struct submodule
*sub
;
1893 if (err_code
== READ_GITFILE_ERR_STAT_FAILED
) {
1894 /* unpopulated as expected */
1895 strbuf_release(&gitdir
);
1899 if (err_code
!= READ_GITFILE_ERR_NOT_A_REPO
)
1900 /* We don't know what broke here. */
1901 read_gitfile_error_die(err_code
, path
, NULL
);
1904 * Maybe populated, but no git directory was found?
1905 * This can happen if the superproject is a submodule
1906 * itself and was just absorbed. The absorption of the
1907 * superproject did not rewrite the git file links yet,
1910 sub
= submodule_from_path(&null_oid
, path
);
1912 die(_("could not lookup name for submodule '%s'"), path
);
1913 connect_work_tree_and_git_dir(path
,
1914 git_path("modules/%s", sub
->name
));
1916 /* Is it already absorbed into the superprojects git dir? */
1917 char *real_sub_git_dir
= real_pathdup(sub_git_dir
, 1);
1918 char *real_common_git_dir
= real_pathdup(get_git_common_dir(), 1);
1920 if (!starts_with(real_sub_git_dir
, real_common_git_dir
))
1921 relocate_single_git_dir_into_superproject(prefix
, path
);
1923 free(real_sub_git_dir
);
1924 free(real_common_git_dir
);
1926 strbuf_release(&gitdir
);
1928 if (flags
& ABSORB_GITDIR_RECURSE_SUBMODULES
) {
1929 struct child_process cp
= CHILD_PROCESS_INIT
;
1930 struct strbuf sb
= STRBUF_INIT
;
1932 if (flags
& ~ABSORB_GITDIR_RECURSE_SUBMODULES
)
1933 die("BUG: we don't know how to pass the flags down?");
1935 strbuf_addstr(&sb
, get_super_prefix_or_empty());
1936 strbuf_addstr(&sb
, path
);
1937 strbuf_addch(&sb
, '/');
1942 argv_array_pushl(&cp
.args
, "--super-prefix", sb
.buf
,
1943 "submodule--helper",
1944 "absorb-git-dirs", NULL
);
1945 prepare_submodule_repo_env(&cp
.env_array
);
1946 if (run_command(&cp
))
1947 die(_("could not recurse into submodule '%s'"), path
);
1949 strbuf_release(&sb
);
1953 const char *get_superproject_working_tree(void)
1955 struct child_process cp
= CHILD_PROCESS_INIT
;
1956 struct strbuf sb
= STRBUF_INIT
;
1957 const char *one_up
= real_path_if_valid("../");
1958 const char *cwd
= xgetcwd();
1959 const char *ret
= NULL
;
1960 const char *subpath
;
1964 if (!is_inside_work_tree())
1967 * We might have a superproject, but it is harder
1975 subpath
= relative_path(cwd
, one_up
, &sb
);
1977 prepare_submodule_repo_env(&cp
.env_array
);
1978 argv_array_pop(&cp
.env_array
);
1980 argv_array_pushl(&cp
.args
, "--literal-pathspecs", "-C", "..",
1981 "ls-files", "-z", "--stage", "--full-name", "--",
1990 if (start_command(&cp
))
1991 die(_("could not start ls-files in .."));
1993 len
= strbuf_read(&sb
, cp
.out
, PATH_MAX
);
1996 if (starts_with(sb
.buf
, "160000")) {
1998 int cwd_len
= strlen(cwd
);
1999 char *super_sub
, *super_wt
;
2002 * There is a superproject having this repo as a submodule.
2003 * The format is <mode> SP <hash> SP <stage> TAB <full name> \0,
2004 * We're only interested in the name after the tab.
2006 super_sub
= strchr(sb
.buf
, '\t') + 1;
2007 super_sub_len
= sb
.buf
+ sb
.len
- super_sub
- 1;
2009 if (super_sub_len
> cwd_len
||
2010 strcmp(&cwd
[cwd_len
- super_sub_len
], super_sub
))
2011 die (_("BUG: returned path string doesn't match cwd?"));
2013 super_wt
= xstrdup(cwd
);
2014 super_wt
[cwd_len
- super_sub_len
] = '\0';
2016 ret
= real_path(super_wt
);
2019 strbuf_release(&sb
);
2021 code
= finish_command(&cp
);
2024 /* '../' is not a git repository */
2026 if (code
== 0 && len
== 0)
2027 /* There is an unrelated git repository at '../' */
2030 die(_("ls-tree returned unexpected return code %d"), code
);
2035 int submodule_to_gitdir(struct strbuf
*buf
, const char *submodule
)
2037 const struct submodule
*sub
;
2038 const char *git_dir
;
2042 strbuf_addstr(buf
, submodule
);
2043 strbuf_complete(buf
, '/');
2044 strbuf_addstr(buf
, ".git");
2046 git_dir
= read_gitfile(buf
->buf
);
2049 strbuf_addstr(buf
, git_dir
);
2051 if (!is_git_directory(buf
->buf
)) {
2052 gitmodules_config();
2053 sub
= submodule_from_path(&null_oid
, submodule
);
2059 strbuf_git_path(buf
, "%s/%s", "modules", sub
->name
);