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"
16 static int config_fetch_recurse_submodules
= RECURSE_SUBMODULES_ON_DEMAND
;
17 static struct string_list changed_submodule_paths
;
18 static int initialized_fetch_ref_tips
;
19 static struct sha1_array ref_tips_before_fetch
;
20 static struct sha1_array ref_tips_after_fetch
;
23 * The following flag is set if the .gitmodules file is unmerged. We then
24 * disable recursion for all submodules where .git/config doesn't have a
25 * matching config entry because we can't guess what might be configured in
26 * .gitmodules unless the user resolves the conflict. When a command line
27 * option is given (which always overrides configuration) this flag will be
30 static int gitmodules_is_unmerged
;
33 * This flag is set if the .gitmodules file had unstaged modifications on
34 * startup. This must be checked before allowing modifications to the
35 * .gitmodules file with the intention to stage them later, because when
36 * continuing we would stage the modifications the user didn't stage herself
37 * too. That might change in a future version when we learn to stage the
38 * changes we do ourselves without staging any previous modifications.
40 static int gitmodules_is_modified
;
42 int is_staging_gitmodules_ok(void)
44 return !gitmodules_is_modified
;
48 * Try to update the "path" entry in the "submodule.<name>" section of the
49 * .gitmodules file. Return 0 only if a .gitmodules file was found, a section
50 * with the correct path=<oldpath> setting was found and we could update it.
52 int update_path_in_gitmodules(const char *oldpath
, const char *newpath
)
54 struct strbuf entry
= STRBUF_INIT
;
55 const struct submodule
*submodule
;
57 if (!file_exists(".gitmodules")) /* Do nothing without .gitmodules */
60 if (gitmodules_is_unmerged
)
61 die(_("Cannot change unmerged .gitmodules, resolve merge conflicts first"));
63 submodule
= submodule_from_path(null_sha1
, oldpath
);
64 if (!submodule
|| !submodule
->name
) {
65 warning(_("Could not find section in .gitmodules where path=%s"), oldpath
);
68 strbuf_addstr(&entry
, "submodule.");
69 strbuf_addstr(&entry
, submodule
->name
);
70 strbuf_addstr(&entry
, ".path");
71 if (git_config_set_in_file(".gitmodules", entry
.buf
, newpath
) < 0) {
72 /* Maybe the user already did that, don't error out here */
73 warning(_("Could not update .gitmodules entry %s"), entry
.buf
);
74 strbuf_release(&entry
);
77 strbuf_release(&entry
);
82 * Try to remove the "submodule.<name>" section from .gitmodules where the given
83 * path is configured. Return 0 only if a .gitmodules file was found, a section
84 * with the correct path=<path> setting was found and we could remove it.
86 int remove_path_from_gitmodules(const char *path
)
88 struct strbuf sect
= STRBUF_INIT
;
89 const struct submodule
*submodule
;
91 if (!file_exists(".gitmodules")) /* Do nothing without .gitmodules */
94 if (gitmodules_is_unmerged
)
95 die(_("Cannot change unmerged .gitmodules, resolve merge conflicts first"));
97 submodule
= submodule_from_path(null_sha1
, path
);
98 if (!submodule
|| !submodule
->name
) {
99 warning(_("Could not find section in .gitmodules where path=%s"), path
);
102 strbuf_addstr(§
, "submodule.");
103 strbuf_addstr(§
, submodule
->name
);
104 if (git_config_rename_section_in_file(".gitmodules", sect
.buf
, NULL
) < 0) {
105 /* Maybe the user already did that, don't error out here */
106 warning(_("Could not remove .gitmodules entry for %s"), path
);
107 strbuf_release(§
);
110 strbuf_release(§
);
114 void stage_updated_gitmodules(void)
116 if (add_file_to_cache(".gitmodules", 0))
117 die(_("staging updated .gitmodules failed"));
120 static int add_submodule_odb(const char *path
)
122 struct strbuf objects_directory
= STRBUF_INIT
;
123 struct alternate_object_database
*alt_odb
;
127 strbuf_addf(&objects_directory
, "%s/.git", path
);
128 git_dir
= read_gitfile(objects_directory
.buf
);
130 strbuf_reset(&objects_directory
);
131 strbuf_addstr(&objects_directory
, git_dir
);
133 strbuf_addstr(&objects_directory
, "/objects/");
134 if (!is_directory(objects_directory
.buf
)) {
138 /* avoid adding it twice */
139 for (alt_odb
= alt_odb_list
; alt_odb
; alt_odb
= alt_odb
->next
)
140 if (alt_odb
->name
- alt_odb
->base
== objects_directory
.len
&&
141 !strncmp(alt_odb
->base
, objects_directory
.buf
,
142 objects_directory
.len
))
145 alt_odb
= xmalloc(objects_directory
.len
+ 42 + sizeof(*alt_odb
));
146 alt_odb
->next
= alt_odb_list
;
147 strcpy(alt_odb
->base
, objects_directory
.buf
);
148 alt_odb
->name
= alt_odb
->base
+ objects_directory
.len
;
149 alt_odb
->name
[2] = '/';
150 alt_odb
->name
[40] = '\0';
151 alt_odb
->name
[41] = '\0';
152 alt_odb_list
= alt_odb
;
154 /* add possible alternates from the submodule */
155 read_info_alternates(objects_directory
.buf
, 0);
158 strbuf_release(&objects_directory
);
162 void set_diffopt_flags_from_submodule_config(struct diff_options
*diffopt
,
165 const struct submodule
*submodule
= submodule_from_path(null_sha1
, path
);
167 if (submodule
->ignore
)
168 handle_ignore_submodules_arg(diffopt
, submodule
->ignore
);
169 else if (gitmodules_is_unmerged
)
170 DIFF_OPT_SET(diffopt
, IGNORE_SUBMODULES
);
174 int submodule_config(const char *var
, const char *value
, void *cb
)
176 if (starts_with(var
, "submodule."))
177 return parse_submodule_config_option(var
, value
);
178 else if (!strcmp(var
, "fetch.recursesubmodules")) {
179 config_fetch_recurse_submodules
= parse_fetch_recurse_submodules_arg(var
, value
);
185 void gitmodules_config(void)
187 const char *work_tree
= get_git_work_tree();
189 struct strbuf gitmodules_path
= STRBUF_INIT
;
191 strbuf_addstr(&gitmodules_path
, work_tree
);
192 strbuf_addstr(&gitmodules_path
, "/.gitmodules");
193 if (read_cache() < 0)
194 die("index file corrupt");
195 pos
= cache_name_pos(".gitmodules", 11);
196 if (pos
< 0) { /* .gitmodules not found or isn't merged */
198 if (active_nr
> pos
) { /* there is a .gitmodules */
199 const struct cache_entry
*ce
= active_cache
[pos
];
200 if (ce_namelen(ce
) == 11 &&
201 !memcmp(ce
->name
, ".gitmodules", 11))
202 gitmodules_is_unmerged
= 1;
204 } else if (pos
< active_nr
) {
206 if (lstat(".gitmodules", &st
) == 0 &&
207 ce_match_stat(active_cache
[pos
], &st
, 0) & DATA_CHANGED
)
208 gitmodules_is_modified
= 1;
211 if (!gitmodules_is_unmerged
)
212 git_config_from_file(submodule_config
, gitmodules_path
.buf
, NULL
);
213 strbuf_release(&gitmodules_path
);
217 void handle_ignore_submodules_arg(struct diff_options
*diffopt
,
220 DIFF_OPT_CLR(diffopt
, IGNORE_SUBMODULES
);
221 DIFF_OPT_CLR(diffopt
, IGNORE_UNTRACKED_IN_SUBMODULES
);
222 DIFF_OPT_CLR(diffopt
, IGNORE_DIRTY_SUBMODULES
);
224 if (!strcmp(arg
, "all"))
225 DIFF_OPT_SET(diffopt
, IGNORE_SUBMODULES
);
226 else if (!strcmp(arg
, "untracked"))
227 DIFF_OPT_SET(diffopt
, IGNORE_UNTRACKED_IN_SUBMODULES
);
228 else if (!strcmp(arg
, "dirty"))
229 DIFF_OPT_SET(diffopt
, IGNORE_DIRTY_SUBMODULES
);
230 else if (strcmp(arg
, "none"))
231 die("bad --ignore-submodules argument: %s", arg
);
234 static int prepare_submodule_summary(struct rev_info
*rev
, const char *path
,
235 struct commit
*left
, struct commit
*right
,
236 int *fast_forward
, int *fast_backward
)
238 struct commit_list
*merge_bases
, *list
;
240 init_revisions(rev
, NULL
);
241 setup_revisions(0, NULL
, rev
, NULL
);
243 rev
->first_parent_only
= 1;
244 left
->object
.flags
|= SYMMETRIC_LEFT
;
245 add_pending_object(rev
, &left
->object
, path
);
246 add_pending_object(rev
, &right
->object
, path
);
247 merge_bases
= get_merge_bases(left
, right
, 1);
249 if (merge_bases
->item
== left
)
251 else if (merge_bases
->item
== right
)
254 for (list
= merge_bases
; list
; list
= list
->next
) {
255 list
->item
->object
.flags
|= UNINTERESTING
;
256 add_pending_object(rev
, &list
->item
->object
,
257 sha1_to_hex(list
->item
->object
.sha1
));
259 return prepare_revision_walk(rev
);
262 static void print_submodule_summary(struct rev_info
*rev
, FILE *f
,
263 const char *line_prefix
,
264 const char *del
, const char *add
, const char *reset
)
266 static const char format
[] = " %m %s";
267 struct strbuf sb
= STRBUF_INIT
;
268 struct commit
*commit
;
270 while ((commit
= get_revision(rev
))) {
271 struct pretty_print_context ctx
= {0};
272 ctx
.date_mode
= rev
->date_mode
;
273 ctx
.output_encoding
= get_log_output_encoding();
274 strbuf_setlen(&sb
, 0);
275 strbuf_addstr(&sb
, line_prefix
);
276 if (commit
->object
.flags
& SYMMETRIC_LEFT
) {
278 strbuf_addstr(&sb
, del
);
281 strbuf_addstr(&sb
, add
);
282 format_commit_message(commit
, format
, &sb
, &ctx
);
284 strbuf_addstr(&sb
, reset
);
285 strbuf_addch(&sb
, '\n');
286 fprintf(f
, "%s", sb
.buf
);
291 void show_submodule_summary(FILE *f
, const char *path
,
292 const char *line_prefix
,
293 unsigned char one
[20], unsigned char two
[20],
294 unsigned dirty_submodule
, const char *meta
,
295 const char *del
, const char *add
, const char *reset
)
298 struct commit
*left
= NULL
, *right
= NULL
;
299 const char *message
= NULL
;
300 struct strbuf sb
= STRBUF_INIT
;
301 int fast_forward
= 0, fast_backward
= 0;
303 if (is_null_sha1(two
))
304 message
= "(submodule deleted)";
305 else if (add_submodule_odb(path
))
306 message
= "(not checked out)";
307 else if (is_null_sha1(one
))
308 message
= "(new submodule)";
309 else if (!(left
= lookup_commit_reference(one
)) ||
310 !(right
= lookup_commit_reference(two
)))
311 message
= "(commits not present)";
312 else if (prepare_submodule_summary(&rev
, path
, left
, right
,
313 &fast_forward
, &fast_backward
))
314 message
= "(revision walker failed)";
316 if (dirty_submodule
& DIRTY_SUBMODULE_UNTRACKED
)
317 fprintf(f
, "%sSubmodule %s contains untracked content\n",
319 if (dirty_submodule
& DIRTY_SUBMODULE_MODIFIED
)
320 fprintf(f
, "%sSubmodule %s contains modified content\n",
323 if (!hashcmp(one
, two
)) {
328 strbuf_addf(&sb
, "%s%sSubmodule %s %s..", line_prefix
, meta
, path
,
329 find_unique_abbrev(one
, DEFAULT_ABBREV
));
330 if (!fast_backward
&& !fast_forward
)
331 strbuf_addch(&sb
, '.');
332 strbuf_addf(&sb
, "%s", find_unique_abbrev(two
, DEFAULT_ABBREV
));
334 strbuf_addf(&sb
, " %s%s\n", message
, reset
);
336 strbuf_addf(&sb
, "%s:%s\n", fast_backward
? " (rewind)" : "", reset
);
337 fwrite(sb
.buf
, sb
.len
, 1, f
);
339 if (!message
) /* only NULL if we succeeded in setting up the walk */
340 print_submodule_summary(&rev
, f
, line_prefix
, del
, add
, reset
);
342 clear_commit_marks(left
, ~0);
344 clear_commit_marks(right
, ~0);
349 void set_config_fetch_recurse_submodules(int value
)
351 config_fetch_recurse_submodules
= value
;
354 static int has_remote(const char *refname
, const unsigned char *sha1
, int flags
, void *cb_data
)
359 static int submodule_needs_pushing(const char *path
, const unsigned char sha1
[20])
361 if (add_submodule_odb(path
) || !lookup_commit_reference(sha1
))
364 if (for_each_remote_ref_submodule(path
, has_remote
, NULL
) > 0) {
365 struct child_process cp
;
366 const char *argv
[] = {"rev-list", NULL
, "--not", "--remotes", "-n", "1" , NULL
};
367 struct strbuf buf
= STRBUF_INIT
;
368 int needs_pushing
= 0;
370 argv
[1] = sha1_to_hex(sha1
);
371 memset(&cp
, 0, sizeof(cp
));
373 cp
.env
= local_repo_env
;
378 if (start_command(&cp
))
379 die("Could not run 'git rev-list %s --not --remotes -n 1' command in submodule %s",
380 sha1_to_hex(sha1
), path
);
381 if (strbuf_read(&buf
, cp
.out
, 41))
385 strbuf_release(&buf
);
386 return needs_pushing
;
392 static void collect_submodules_from_diff(struct diff_queue_struct
*q
,
393 struct diff_options
*options
,
397 struct string_list
*needs_pushing
= data
;
399 for (i
= 0; i
< q
->nr
; i
++) {
400 struct diff_filepair
*p
= q
->queue
[i
];
401 if (!S_ISGITLINK(p
->two
->mode
))
403 if (submodule_needs_pushing(p
->two
->path
, p
->two
->sha1
))
404 string_list_insert(needs_pushing
, p
->two
->path
);
408 static void find_unpushed_submodule_commits(struct commit
*commit
,
409 struct string_list
*needs_pushing
)
413 init_revisions(&rev
, NULL
);
414 rev
.diffopt
.output_format
|= DIFF_FORMAT_CALLBACK
;
415 rev
.diffopt
.format_callback
= collect_submodules_from_diff
;
416 rev
.diffopt
.format_callback_data
= needs_pushing
;
417 diff_tree_combined_merge(commit
, 1, &rev
);
420 int find_unpushed_submodules(unsigned char new_sha1
[20],
421 const char *remotes_name
, struct string_list
*needs_pushing
)
424 struct commit
*commit
;
425 const char *argv
[] = {NULL
, NULL
, "--not", "NULL", NULL
};
426 int argc
= ARRAY_SIZE(argv
) - 1;
429 struct strbuf remotes_arg
= STRBUF_INIT
;
431 strbuf_addf(&remotes_arg
, "--remotes=%s", remotes_name
);
432 init_revisions(&rev
, NULL
);
433 sha1_copy
= xstrdup(sha1_to_hex(new_sha1
));
435 argv
[3] = remotes_arg
.buf
;
436 setup_revisions(argc
, argv
, &rev
, NULL
);
437 if (prepare_revision_walk(&rev
))
438 die("revision walk setup failed");
440 while ((commit
= get_revision(&rev
)) != NULL
)
441 find_unpushed_submodule_commits(commit
, needs_pushing
);
443 reset_revision_walk();
445 strbuf_release(&remotes_arg
);
447 return needs_pushing
->nr
;
450 static int push_submodule(const char *path
)
452 if (add_submodule_odb(path
))
455 if (for_each_remote_ref_submodule(path
, has_remote
, NULL
) > 0) {
456 struct child_process cp
;
457 const char *argv
[] = {"push", NULL
};
459 memset(&cp
, 0, sizeof(cp
));
461 cp
.env
= local_repo_env
;
465 if (run_command(&cp
))
473 int push_unpushed_submodules(unsigned char new_sha1
[20], const char *remotes_name
)
476 struct string_list needs_pushing
;
478 memset(&needs_pushing
, 0, sizeof(struct string_list
));
479 needs_pushing
.strdup_strings
= 1;
481 if (!find_unpushed_submodules(new_sha1
, remotes_name
, &needs_pushing
))
484 for (i
= 0; i
< needs_pushing
.nr
; i
++) {
485 const char *path
= needs_pushing
.items
[i
].string
;
486 fprintf(stderr
, "Pushing submodule '%s'\n", path
);
487 if (!push_submodule(path
)) {
488 fprintf(stderr
, "Unable to push submodule '%s'\n", path
);
493 string_list_clear(&needs_pushing
, 0);
498 static int is_submodule_commit_present(const char *path
, unsigned char sha1
[20])
501 if (!add_submodule_odb(path
) && lookup_commit_reference(sha1
)) {
502 /* Even if the submodule is checked out and the commit is
503 * present, make sure it is reachable from a ref. */
504 struct child_process cp
;
505 const char *argv
[] = {"rev-list", "-n", "1", NULL
, "--not", "--all", NULL
};
506 struct strbuf buf
= STRBUF_INIT
;
508 argv
[3] = sha1_to_hex(sha1
);
509 memset(&cp
, 0, sizeof(cp
));
511 cp
.env
= local_repo_env
;
516 if (!run_command(&cp
) && !strbuf_read(&buf
, cp
.out
, 1024))
520 strbuf_release(&buf
);
525 static void submodule_collect_changed_cb(struct diff_queue_struct
*q
,
526 struct diff_options
*options
,
530 for (i
= 0; i
< q
->nr
; i
++) {
531 struct diff_filepair
*p
= q
->queue
[i
];
532 if (!S_ISGITLINK(p
->two
->mode
))
535 if (S_ISGITLINK(p
->one
->mode
)) {
536 /* NEEDSWORK: We should honor the name configured in
537 * the .gitmodules file of the commit we are examining
538 * here to be able to correctly follow submodules
539 * being moved around. */
540 struct string_list_item
*path
;
541 path
= unsorted_string_list_lookup(&changed_submodule_paths
, p
->two
->path
);
542 if (!path
&& !is_submodule_commit_present(p
->two
->path
, p
->two
->sha1
))
543 string_list_append(&changed_submodule_paths
, xstrdup(p
->two
->path
));
545 /* Submodule is new or was moved here */
546 /* NEEDSWORK: When the .git directories of submodules
547 * live inside the superprojects .git directory some
548 * day we should fetch new submodules directly into
549 * that location too when config or options request
550 * that so they can be checked out from there. */
556 static int add_sha1_to_array(const char *ref
, const unsigned char *sha1
,
557 int flags
, void *data
)
559 sha1_array_append(data
, sha1
);
563 void check_for_new_submodule_commits(unsigned char new_sha1
[20])
565 if (!initialized_fetch_ref_tips
) {
566 for_each_ref(add_sha1_to_array
, &ref_tips_before_fetch
);
567 initialized_fetch_ref_tips
= 1;
570 sha1_array_append(&ref_tips_after_fetch
, new_sha1
);
573 static void add_sha1_to_argv(const unsigned char sha1
[20], void *data
)
575 argv_array_push(data
, sha1_to_hex(sha1
));
578 static void calculate_changed_submodule_paths(void)
581 struct commit
*commit
;
582 struct argv_array argv
= ARGV_ARRAY_INIT
;
584 /* No need to check if there are no submodules configured */
585 if (!submodule_from_path(NULL
, NULL
))
588 init_revisions(&rev
, NULL
);
589 argv_array_push(&argv
, "--"); /* argv[0] program name */
590 sha1_array_for_each_unique(&ref_tips_after_fetch
,
591 add_sha1_to_argv
, &argv
);
592 argv_array_push(&argv
, "--not");
593 sha1_array_for_each_unique(&ref_tips_before_fetch
,
594 add_sha1_to_argv
, &argv
);
595 setup_revisions(argv
.argc
, argv
.argv
, &rev
, NULL
);
596 if (prepare_revision_walk(&rev
))
597 die("revision walk setup failed");
600 * Collect all submodules (whether checked out or not) for which new
601 * commits have been recorded upstream in "changed_submodule_paths".
603 while ((commit
= get_revision(&rev
))) {
604 struct commit_list
*parent
= commit
->parents
;
606 struct diff_options diff_opts
;
607 diff_setup(&diff_opts
);
608 DIFF_OPT_SET(&diff_opts
, RECURSIVE
);
609 diff_opts
.output_format
|= DIFF_FORMAT_CALLBACK
;
610 diff_opts
.format_callback
= submodule_collect_changed_cb
;
611 diff_setup_done(&diff_opts
);
612 diff_tree_sha1(parent
->item
->object
.sha1
, commit
->object
.sha1
, "", &diff_opts
);
613 diffcore_std(&diff_opts
);
614 diff_flush(&diff_opts
);
615 parent
= parent
->next
;
619 argv_array_clear(&argv
);
620 sha1_array_clear(&ref_tips_before_fetch
);
621 sha1_array_clear(&ref_tips_after_fetch
);
622 initialized_fetch_ref_tips
= 0;
625 int fetch_populated_submodules(const struct argv_array
*options
,
626 const char *prefix
, int command_line_option
,
630 struct child_process cp
;
631 struct argv_array argv
= ARGV_ARRAY_INIT
;
632 const char *work_tree
= get_git_work_tree();
636 if (read_cache() < 0)
637 die("index file corrupt");
639 argv_array_push(&argv
, "fetch");
640 for (i
= 0; i
< options
->argc
; i
++)
641 argv_array_push(&argv
, options
->argv
[i
]);
642 argv_array_push(&argv
, "--recurse-submodules-default");
643 /* default value, "--submodule-prefix" and its value are added later */
645 memset(&cp
, 0, sizeof(cp
));
646 cp
.env
= local_repo_env
;
650 calculate_changed_submodule_paths();
652 for (i
= 0; i
< active_nr
; i
++) {
653 struct strbuf submodule_path
= STRBUF_INIT
;
654 struct strbuf submodule_git_dir
= STRBUF_INIT
;
655 struct strbuf submodule_prefix
= STRBUF_INIT
;
656 const struct cache_entry
*ce
= active_cache
[i
];
657 const char *git_dir
, *default_argv
;
658 const struct submodule
*submodule
;
660 if (!S_ISGITLINK(ce
->ce_mode
))
663 submodule
= submodule_from_path(null_sha1
, ce
->name
);
665 submodule
= submodule_from_name(null_sha1
, ce
->name
);
667 default_argv
= "yes";
668 if (command_line_option
== RECURSE_SUBMODULES_DEFAULT
) {
670 submodule
->fetch_recurse
!=
671 RECURSE_SUBMODULES_NONE
) {
672 if (submodule
->fetch_recurse
==
673 RECURSE_SUBMODULES_OFF
)
675 if (submodule
->fetch_recurse
==
676 RECURSE_SUBMODULES_ON_DEMAND
) {
677 if (!unsorted_string_list_lookup(&changed_submodule_paths
, ce
->name
))
679 default_argv
= "on-demand";
682 if ((config_fetch_recurse_submodules
== RECURSE_SUBMODULES_OFF
) ||
683 gitmodules_is_unmerged
)
685 if (config_fetch_recurse_submodules
== RECURSE_SUBMODULES_ON_DEMAND
) {
686 if (!unsorted_string_list_lookup(&changed_submodule_paths
, ce
->name
))
688 default_argv
= "on-demand";
691 } else if (command_line_option
== RECURSE_SUBMODULES_ON_DEMAND
) {
692 if (!unsorted_string_list_lookup(&changed_submodule_paths
, ce
->name
))
694 default_argv
= "on-demand";
697 strbuf_addf(&submodule_path
, "%s/%s", work_tree
, ce
->name
);
698 strbuf_addf(&submodule_git_dir
, "%s/.git", submodule_path
.buf
);
699 strbuf_addf(&submodule_prefix
, "%s%s/", prefix
, ce
->name
);
700 git_dir
= read_gitfile(submodule_git_dir
.buf
);
702 git_dir
= submodule_git_dir
.buf
;
703 if (is_directory(git_dir
)) {
705 printf("Fetching submodule %s%s\n", prefix
, ce
->name
);
706 cp
.dir
= submodule_path
.buf
;
707 argv_array_push(&argv
, default_argv
);
708 argv_array_push(&argv
, "--submodule-prefix");
709 argv_array_push(&argv
, submodule_prefix
.buf
);
711 if (run_command(&cp
))
713 argv_array_pop(&argv
);
714 argv_array_pop(&argv
);
715 argv_array_pop(&argv
);
717 strbuf_release(&submodule_path
);
718 strbuf_release(&submodule_git_dir
);
719 strbuf_release(&submodule_prefix
);
721 argv_array_clear(&argv
);
723 string_list_clear(&changed_submodule_paths
, 1);
727 unsigned is_submodule_modified(const char *path
, int ignore_untracked
)
730 struct child_process cp
;
731 const char *argv
[] = {
737 struct strbuf buf
= STRBUF_INIT
;
738 unsigned dirty_submodule
= 0;
739 const char *line
, *next_line
;
742 strbuf_addf(&buf
, "%s/.git", path
);
743 git_dir
= read_gitfile(buf
.buf
);
746 if (!is_directory(git_dir
)) {
747 strbuf_release(&buf
);
748 /* The submodule is not checked out, so it is not modified */
754 if (ignore_untracked
)
757 memset(&cp
, 0, sizeof(cp
));
759 cp
.env
= local_repo_env
;
764 if (start_command(&cp
))
765 die("Could not run 'git status --porcelain' in submodule %s", path
);
767 len
= strbuf_read(&buf
, cp
.out
, 1024);
770 if ((line
[0] == '?') && (line
[1] == '?')) {
771 dirty_submodule
|= DIRTY_SUBMODULE_UNTRACKED
;
772 if (dirty_submodule
& DIRTY_SUBMODULE_MODIFIED
)
775 dirty_submodule
|= DIRTY_SUBMODULE_MODIFIED
;
776 if (ignore_untracked
||
777 (dirty_submodule
& DIRTY_SUBMODULE_UNTRACKED
))
780 next_line
= strchr(line
, '\n');
784 len
-= (next_line
- line
);
789 if (finish_command(&cp
))
790 die("'git status --porcelain' failed in submodule %s", path
);
792 strbuf_release(&buf
);
793 return dirty_submodule
;
796 int submodule_uses_gitfile(const char *path
)
798 struct child_process cp
;
799 const char *argv
[] = {
807 struct strbuf buf
= STRBUF_INIT
;
810 strbuf_addf(&buf
, "%s/.git", path
);
811 git_dir
= read_gitfile(buf
.buf
);
813 strbuf_release(&buf
);
816 strbuf_release(&buf
);
818 /* Now test that all nested submodules use a gitfile too */
819 memset(&cp
, 0, sizeof(cp
));
821 cp
.env
= local_repo_env
;
827 if (run_command(&cp
))
833 int ok_to_remove_submodule(const char *path
)
837 struct child_process cp
;
838 const char *argv
[] = {
842 "--ignore-submodules=none",
845 struct strbuf buf
= STRBUF_INIT
;
846 int ok_to_remove
= 1;
848 if ((lstat(path
, &st
) < 0) || is_empty_dir(path
))
851 if (!submodule_uses_gitfile(path
))
854 memset(&cp
, 0, sizeof(cp
));
856 cp
.env
= local_repo_env
;
861 if (start_command(&cp
))
862 die("Could not run 'git status --porcelain -uall --ignore-submodules=none' in submodule %s", path
);
864 len
= strbuf_read(&buf
, cp
.out
, 1024);
869 if (finish_command(&cp
))
870 die("'git status --porcelain -uall --ignore-submodules=none' failed in submodule %s", path
);
872 strbuf_release(&buf
);
876 static int find_first_merges(struct object_array
*result
, const char *path
,
877 struct commit
*a
, struct commit
*b
)
880 struct object_array merges
= OBJECT_ARRAY_INIT
;
881 struct commit
*commit
;
882 int contains_another
;
884 char merged_revision
[42];
885 const char *rev_args
[] = { "rev-list", "--merges", "--ancestry-path",
886 "--all", merged_revision
, NULL
};
887 struct rev_info revs
;
888 struct setup_revision_opt rev_opts
;
890 memset(result
, 0, sizeof(struct object_array
));
891 memset(&rev_opts
, 0, sizeof(rev_opts
));
893 /* get all revisions that merge commit a */
894 snprintf(merged_revision
, sizeof(merged_revision
), "^%s",
895 sha1_to_hex(a
->object
.sha1
));
896 init_revisions(&revs
, NULL
);
897 rev_opts
.submodule
= path
;
898 setup_revisions(sizeof(rev_args
)/sizeof(char *)-1, rev_args
, &revs
, &rev_opts
);
900 /* save all revisions from the above list that contain b */
901 if (prepare_revision_walk(&revs
))
902 die("revision walk setup failed");
903 while ((commit
= get_revision(&revs
)) != NULL
) {
904 struct object
*o
= &(commit
->object
);
905 if (in_merge_bases(b
, commit
))
906 add_object_array(o
, NULL
, &merges
);
908 reset_revision_walk();
910 /* Now we've got all merges that contain a and b. Prune all
911 * merges that contain another found merge and save them in
914 for (i
= 0; i
< merges
.nr
; i
++) {
915 struct commit
*m1
= (struct commit
*) merges
.objects
[i
].item
;
917 contains_another
= 0;
918 for (j
= 0; j
< merges
.nr
; j
++) {
919 struct commit
*m2
= (struct commit
*) merges
.objects
[j
].item
;
920 if (i
!= j
&& in_merge_bases(m2
, m1
)) {
921 contains_another
= 1;
926 if (!contains_another
)
927 add_object_array(merges
.objects
[i
].item
, NULL
, result
);
930 free(merges
.objects
);
934 static void print_commit(struct commit
*commit
)
936 struct strbuf sb
= STRBUF_INIT
;
937 struct pretty_print_context ctx
= {0};
938 ctx
.date_mode
= DATE_NORMAL
;
939 format_commit_message(commit
, " %h: %m %s", &sb
, &ctx
);
940 fprintf(stderr
, "%s\n", sb
.buf
);
944 #define MERGE_WARNING(path, msg) \
945 warning("Failed to merge submodule %s (%s)", path, msg);
947 int merge_submodule(unsigned char result
[20], const char *path
,
948 const unsigned char base
[20], const unsigned char a
[20],
949 const unsigned char b
[20], int search
)
951 struct commit
*commit_base
, *commit_a
, *commit_b
;
953 struct object_array merges
;
957 /* store a in result in case we fail */
960 /* we can not handle deletion conflicts */
961 if (is_null_sha1(base
))
968 if (add_submodule_odb(path
)) {
969 MERGE_WARNING(path
, "not checked out");
973 if (!(commit_base
= lookup_commit_reference(base
)) ||
974 !(commit_a
= lookup_commit_reference(a
)) ||
975 !(commit_b
= lookup_commit_reference(b
))) {
976 MERGE_WARNING(path
, "commits not present");
980 /* check whether both changes are forward */
981 if (!in_merge_bases(commit_base
, commit_a
) ||
982 !in_merge_bases(commit_base
, commit_b
)) {
983 MERGE_WARNING(path
, "commits don't follow merge-base");
987 /* Case #1: a is contained in b or vice versa */
988 if (in_merge_bases(commit_a
, commit_b
)) {
992 if (in_merge_bases(commit_b
, commit_a
)) {
998 * Case #2: There are one or more merges that contain a and b in
999 * the submodule. If there is only one, then present it as a
1000 * suggestion to the user, but leave it marked unmerged so the
1001 * user needs to confirm the resolution.
1004 /* Skip the search if makes no sense to the calling context. */
1008 /* find commit which merges them */
1009 parent_count
= find_first_merges(&merges
, path
, commit_a
, commit_b
);
1010 switch (parent_count
) {
1012 MERGE_WARNING(path
, "merge following commits not found");
1016 MERGE_WARNING(path
, "not fast-forward");
1017 fprintf(stderr
, "Found a possible merge resolution "
1018 "for the submodule:\n");
1019 print_commit((struct commit
*) merges
.objects
[0].item
);
1021 "If this is correct simply add it to the index "
1024 " git update-index --cacheinfo 160000 %s \"%s\"\n\n"
1025 "which will accept this suggestion.\n",
1026 sha1_to_hex(merges
.objects
[0].item
->sha1
), path
);
1030 MERGE_WARNING(path
, "multiple merges found");
1031 for (i
= 0; i
< merges
.nr
; i
++)
1032 print_commit((struct commit
*) merges
.objects
[i
].item
);
1035 free(merges
.objects
);
1039 /* Update gitfile and core.worktree setting to connect work tree and git dir */
1040 void connect_work_tree_and_git_dir(const char *work_tree
, const char *git_dir
)
1042 struct strbuf file_name
= STRBUF_INIT
;
1043 struct strbuf rel_path
= STRBUF_INIT
;
1044 const char *real_work_tree
= xstrdup(real_path(work_tree
));
1047 /* Update gitfile */
1048 strbuf_addf(&file_name
, "%s/.git", work_tree
);
1049 fp
= fopen(file_name
.buf
, "w");
1051 die(_("Could not create git link %s"), file_name
.buf
);
1052 fprintf(fp
, "gitdir: %s\n", relative_path(git_dir
, real_work_tree
,
1056 /* Update core.worktree setting */
1057 strbuf_reset(&file_name
);
1058 strbuf_addf(&file_name
, "%s/config", git_dir
);
1059 if (git_config_set_in_file(file_name
.buf
, "core.worktree",
1060 relative_path(real_work_tree
, git_dir
,
1062 die(_("Could not set core.worktree in %s"),
1065 strbuf_release(&file_name
);
1066 strbuf_release(&rel_path
);
1067 free((void *)real_work_tree
);