?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
oidtree: avoid nested struct oidtree_node
[git/debian.git] / submodule.c
blob0b1d9c1dde5a8fc5cec04f13241f94b8a4378d5f
1
2 #include "cache.h"
3 #include "repository.h"
4 #include "config.h"
5 #include "submodule-config.h"
6 #include "submodule.h"
7 #include "dir.h"
8 #include "diff.h"
9 #include "commit.h"
10 #include "revision.h"
11 #include "run-command.h"
12 #include "diffcore.h"
13 #include "refs.h"
14 #include "string-list.h"
15 #include "oid-array.h"
16 #include "strvec.h"
17 #include "blob.h"
18 #include "thread-utils.h"
19 #include "quote.h"
20 #include "remote.h"
21 #include "worktree.h"
22 #include "parse-options.h"
23 #include "object-store.h"
24 #include "commit-reach.h"
25
26 static int config_update_recurse_submodules = RECURSE_SUBMODULES_OFF;
27 static int initialized_fetch_ref_tips;
28 static struct oid_array ref_tips_before_fetch;
29 static struct oid_array ref_tips_after_fetch;
30
31 /*
32 * Check if the .gitmodules file is unmerged. Parsing of the .gitmodules file
33 * will be disabled because we can't guess what might be configured in
34 * .gitmodules unless the user resolves the conflict.
35 */
36 int is_gitmodules_unmerged(struct index_state *istate)
37 {
38 int pos = index_name_pos(istate, GITMODULES_FILE, strlen(GITMODULES_FILE));
39 if (pos < 0) { /* .gitmodules not found or isn't merged */
40 pos = -1 - pos;
41 if (istate->cache_nr > pos) { /* there is a .gitmodules */
42 const struct cache_entry *ce = istate->cache[pos];
43 if (ce_namelen(ce) == strlen(GITMODULES_FILE) &&
44 !strcmp(ce->name, GITMODULES_FILE))
45 return 1;
46 }
47 }
48
49 return 0;
50 }
51
52 /*
53 * Check if the .gitmodules file is safe to write.
54 *
55 * Writing to the .gitmodules file requires that the file exists in the
56 * working tree or, if it doesn't, that a brand new .gitmodules file is going
57 * to be created (i.e. it's neither in the index nor in the current branch).
58 *
59 * It is not safe to write to .gitmodules if it's not in the working tree but
60 * it is in the index or in the current branch, because writing new values
61 * (and staging them) would blindly overwrite ALL the old content.
62 */
63 int is_writing_gitmodules_ok(void)
64 {
65 struct object_id oid;
66 return file_exists(GITMODULES_FILE) ||
67 (get_oid(GITMODULES_INDEX, &oid) < 0 && get_oid(GITMODULES_HEAD, &oid) < 0);
68 }
69
70 /*
71 * Check if the .gitmodules file has unstaged modifications. This must be
72 * checked before allowing modifications to the .gitmodules file with the
73 * intention to stage them later, because when continuing we would stage the
74 * modifications the user didn't stage herself too. That might change in a
75 * future version when we learn to stage the changes we do ourselves without
76 * staging any previous modifications.
77 */
78 int is_staging_gitmodules_ok(struct index_state *istate)
79 {
80 int pos = index_name_pos(istate, GITMODULES_FILE, strlen(GITMODULES_FILE));
81
82 if ((pos >= 0) && (pos < istate->cache_nr)) {
83 struct stat st;
84 if (lstat(GITMODULES_FILE, &st) == 0 &&
85 ie_modified(istate, istate->cache[pos], &st, 0) & DATA_CHANGED)
86 return 0;
87 }
88
89 return 1;
90 }
91
92 static int for_each_remote_ref_submodule(const char *submodule,
93 each_ref_fn fn, void *cb_data)
94 {
95 return refs_for_each_remote_ref(get_submodule_ref_store(submodule),
96 fn, cb_data);
97 }
98
99 /*
100 * Try to update the "path" entry in the "submodule.<name>" section of the
101 * .gitmodules file. Return 0 only if a .gitmodules file was found, a section
102 * with the correct path=<oldpath> setting was found and we could update it.
103 */
104 int update_path_in_gitmodules(const char *oldpath, const char *newpath)
105 {
106 struct strbuf entry = STRBUF_INIT;
107 const struct submodule *submodule;
108 int ret;
109
110 if (!file_exists(GITMODULES_FILE)) /* Do nothing without .gitmodules */
111 return -1;
112
113 if (is_gitmodules_unmerged(the_repository->index))
114 die(_("Cannot change unmerged .gitmodules, resolve merge conflicts first"));
115
116 submodule = submodule_from_path(the_repository, null_oid(), oldpath);
117 if (!submodule || !submodule->name) {
118 warning(_("Could not find section in .gitmodules where path=%s"), oldpath);
119 return -1;
120 }
121 strbuf_addstr(&entry, "submodule.");
122 strbuf_addstr(&entry, submodule->name);
123 strbuf_addstr(&entry, ".path");
124 ret = config_set_in_gitmodules_file_gently(entry.buf, newpath);
125 strbuf_release(&entry);
126 return ret;
127 }
128
129 /*
130 * Try to remove the "submodule.<name>" section from .gitmodules where the given
131 * path is configured. Return 0 only if a .gitmodules file was found, a section
132 * with the correct path=<path> setting was found and we could remove it.
133 */
134 int remove_path_from_gitmodules(const char *path)
135 {
136 struct strbuf sect = STRBUF_INIT;
137 const struct submodule *submodule;
138
139 if (!file_exists(GITMODULES_FILE)) /* Do nothing without .gitmodules */
140 return -1;
141
142 if (is_gitmodules_unmerged(the_repository->index))
143 die(_("Cannot change unmerged .gitmodules, resolve merge conflicts first"));
144
145 submodule = submodule_from_path(the_repository, null_oid(), path);
146 if (!submodule || !submodule->name) {
147 warning(_("Could not find section in .gitmodules where path=%s"), path);
148 return -1;
149 }
150 strbuf_addstr(&sect, "submodule.");
151 strbuf_addstr(&sect, submodule->name);
152 if (git_config_rename_section_in_file(GITMODULES_FILE, sect.buf, NULL) < 0) {
153 /* Maybe the user already did that, don't error out here */
154 warning(_("Could not remove .gitmodules entry for %s"), path);
155 strbuf_release(&sect);
156 return -1;
157 }
158 strbuf_release(&sect);
159 return 0;
160 }
161
162 void stage_updated_gitmodules(struct index_state *istate)
163 {
164 if (add_file_to_index(istate, GITMODULES_FILE, 0))
165 die(_("staging updated .gitmodules failed"));
166 }
167
168 /* TODO: remove this function, use repo_submodule_init instead. */
169 int add_submodule_odb(const char *path)
170 {
171 struct strbuf objects_directory = STRBUF_INIT;
172 int ret = 0;
173
174 ret = strbuf_git_path_submodule(&objects_directory, path, "objects/");
175 if (ret)
176 goto done;
177 if (!is_directory(objects_directory.buf)) {
178 ret = -1;
179 goto done;
180 }
181 add_to_alternates_memory(objects_directory.buf);
182 done:
183 strbuf_release(&objects_directory);
184 return ret;
185 }
186
187 void set_diffopt_flags_from_submodule_config(struct diff_options *diffopt,
188 const char *path)
189 {
190 const struct submodule *submodule = submodule_from_path(the_repository,
191 null_oid(),
192 path);
193 if (submodule) {
194 const char *ignore;
195 char *key;
196
197 key = xstrfmt("submodule.%s.ignore", submodule->name);
198 if (repo_config_get_string_tmp(the_repository, key, &ignore))
199 ignore = submodule->ignore;
200 free(key);
201
202 if (ignore)
203 handle_ignore_submodules_arg(diffopt, ignore);
204 else if (is_gitmodules_unmerged(the_repository->index))
205 diffopt->flags.ignore_submodules = 1;
206 }
207 }
208
209 /* Cheap function that only determines if we're interested in submodules at all */
210 int git_default_submodule_config(const char *var, const char *value, void *cb)
211 {
212 if (!strcmp(var, "submodule.recurse")) {
213 int v = git_config_bool(var, value) ?
214 RECURSE_SUBMODULES_ON : RECURSE_SUBMODULES_OFF;
215 config_update_recurse_submodules = v;
216 }
217 return 0;
218 }
219
220 int option_parse_recurse_submodules_worktree_updater(const struct option *opt,
221 const char *arg, int unset)
222 {
223 if (unset) {
224 config_update_recurse_submodules = RECURSE_SUBMODULES_OFF;
225 return 0;
226 }
227 if (arg)
228 config_update_recurse_submodules =
229 parse_update_recurse_submodules_arg(opt->long_name,
230 arg);
231 else
232 config_update_recurse_submodules = RECURSE_SUBMODULES_ON;
233
234 return 0;
235 }
236
237 /*
238 * Determine if a submodule has been initialized at a given 'path'
239 */
240 int is_submodule_active(struct repository *repo, const char *path)
241 {
242 int ret = 0;
243 char *key = NULL;
244 char *value = NULL;
245 const struct string_list *sl;
246 const struct submodule *module;
247
248 module = submodule_from_path(repo, null_oid(), path);
249
250 /* early return if there isn't a path->module mapping */
251 if (!module)
252 return 0;
253
254 /* submodule.<name>.active is set */
255 key = xstrfmt("submodule.%s.active", module->name);
256 if (!repo_config_get_bool(repo, key, &ret)) {
257 free(key);
258 return ret;
259 }
260 free(key);
261
262 /* submodule.active is set */
263 sl = repo_config_get_value_multi(repo, "submodule.active");
264 if (sl) {
265 struct pathspec ps;
266 struct strvec args = STRVEC_INIT;
267 const struct string_list_item *item;
268
269 for_each_string_list_item(item, sl) {
270 strvec_push(&args, item->string);
271 }
272
273 parse_pathspec(&ps, 0, 0, NULL, args.v);
274 ret = match_pathspec(repo->index, &ps, path, strlen(path), 0, NULL, 1);
275
276 strvec_clear(&args);
277 clear_pathspec(&ps);
278 return ret;
279 }
280
281 /* fallback to checking if the URL is set */
282 key = xstrfmt("submodule.%s.url", module->name);
283 ret = !repo_config_get_string(repo, key, &value);
284
285 free(value);
286 free(key);
287 return ret;
288 }
289
290 int is_submodule_populated_gently(const char *path, int *return_error_code)
291 {
292 int ret = 0;
293 char *gitdir = xstrfmt("%s/.git", path);
294
295 if (resolve_gitdir_gently(gitdir, return_error_code))
296 ret = 1;
297
298 free(gitdir);
299 return ret;
300 }
301
302 /*
303 * Dies if the provided 'prefix' corresponds to an unpopulated submodule
304 */
305 void die_in_unpopulated_submodule(struct index_state *istate,
306 const char *prefix)
307 {
308 int i, prefixlen;
309
310 if (!prefix)
311 return;
312
313 prefixlen = strlen(prefix);
314
315 for (i = 0; i < istate->cache_nr; i++) {
316 struct cache_entry *ce = istate->cache[i];
317 int ce_len = ce_namelen(ce);
318
319 if (!S_ISGITLINK(ce->ce_mode))
320 continue;
321 if (prefixlen <= ce_len)
322 continue;
323 if (strncmp(ce->name, prefix, ce_len))
324 continue;
325 if (prefix[ce_len] != '/')
326 continue;
327
328 die(_("in unpopulated submodule '%s'"), ce->name);
329 }
330 }
331
332 /*
333 * Dies if any paths in the provided pathspec descends into a submodule
334 */
335 void die_path_inside_submodule(struct index_state *istate,
336 const struct pathspec *ps)
337 {
338 int i, j;
339
340 for (i = 0; i < istate->cache_nr; i++) {
341 struct cache_entry *ce = istate->cache[i];
342 int ce_len = ce_namelen(ce);
343
344 if (!S_ISGITLINK(ce->ce_mode))
345 continue;
346
347 for (j = 0; j < ps->nr ; j++) {
348 const struct pathspec_item *item = &ps->items[j];
349
350 if (item->len <= ce_len)
351 continue;
352 if (item->match[ce_len] != '/')
353 continue;
354 if (strncmp(ce->name, item->match, ce_len))
355 continue;
356 if (item->len == ce_len + 1)
357 continue;
358
359 die(_("Pathspec '%s' is in submodule '%.*s'"),
360 item->original, ce_len, ce->name);
361 }
362 }
363 }
364
365 enum submodule_update_type parse_submodule_update_type(const char *value)
366 {
367 if (!strcmp(value, "none"))
368 return SM_UPDATE_NONE;
369 else if (!strcmp(value, "checkout"))
370 return SM_UPDATE_CHECKOUT;
371 else if (!strcmp(value, "rebase"))
372 return SM_UPDATE_REBASE;
373 else if (!strcmp(value, "merge"))
374 return SM_UPDATE_MERGE;
375 else if (*value == '!')
376 return SM_UPDATE_COMMAND;
377 else
378 return SM_UPDATE_UNSPECIFIED;
379 }
380
381 int parse_submodule_update_strategy(const char *value,
382 struct submodule_update_strategy *dst)
383 {
384 enum submodule_update_type type;
385
386 free((void*)dst->command);
387 dst->command = NULL;
388
389 type = parse_submodule_update_type(value);
390 if (type == SM_UPDATE_UNSPECIFIED)
391 return -1;
392
393 dst->type = type;
394 if (type == SM_UPDATE_COMMAND)
395 dst->command = xstrdup(value + 1);
396
397 return 0;
398 }
399
400 const char *submodule_strategy_to_string(const struct submodule_update_strategy *s)
401 {
402 struct strbuf sb = STRBUF_INIT;
403 switch (s->type) {
404 case SM_UPDATE_CHECKOUT:
405 return "checkout";
406 case SM_UPDATE_MERGE:
407 return "merge";
408 case SM_UPDATE_REBASE:
409 return "rebase";
410 case SM_UPDATE_NONE:
411 return "none";
412 case SM_UPDATE_UNSPECIFIED:
413 return NULL;
414 case SM_UPDATE_COMMAND:
415 strbuf_addf(&sb, "!%s", s->command);
416 return strbuf_detach(&sb, NULL);
417 }
418 return NULL;
419 }
420
421 void handle_ignore_submodules_arg(struct diff_options *diffopt,
422 const char *arg)
423 {
424 diffopt->flags.ignore_submodule_set = 1;
425 diffopt->flags.ignore_submodules = 0;
426 diffopt->flags.ignore_untracked_in_submodules = 0;
427 diffopt->flags.ignore_dirty_submodules = 0;
428
429 if (!strcmp(arg, "all"))
430 diffopt->flags.ignore_submodules = 1;
431 else if (!strcmp(arg, "untracked"))
432 diffopt->flags.ignore_untracked_in_submodules = 1;
433 else if (!strcmp(arg, "dirty"))
434 diffopt->flags.ignore_dirty_submodules = 1;
435 else if (strcmp(arg, "none"))
436 die(_("bad --ignore-submodules argument: %s"), arg);
437 /*
438 * Please update _git_status() in git-completion.bash when you
439 * add new options
440 */
441 }
442
443 static int prepare_submodule_diff_summary(struct repository *r, struct rev_info *rev,
444 const char *path,
445 struct commit *left, struct commit *right,
446 struct commit_list *merge_bases)
447 {
448 struct commit_list *list;
449
450 repo_init_revisions(r, rev, NULL);
451 setup_revisions(0, NULL, rev, NULL);
452 rev->left_right = 1;
453 rev->first_parent_only = 1;
454 left->object.flags |= SYMMETRIC_LEFT;
455 add_pending_object(rev, &left->object, path);
456 add_pending_object(rev, &right->object, path);
457 for (list = merge_bases; list; list = list->next) {
458 list->item->object.flags |= UNINTERESTING;
459 add_pending_object(rev, &list->item->object,
460 oid_to_hex(&list->item->object.oid));
461 }
462 return prepare_revision_walk(rev);
463 }
464
465 static void print_submodule_diff_summary(struct repository *r, struct rev_info *rev, struct diff_options *o)
466 {
467 static const char format[] = " %m %s";
468 struct strbuf sb = STRBUF_INIT;
469 struct commit *commit;
470
471 while ((commit = get_revision(rev))) {
472 struct pretty_print_context ctx = {0};
473 ctx.date_mode = rev->date_mode;
474 ctx.output_encoding = get_log_output_encoding();
475 strbuf_setlen(&sb, 0);
476 repo_format_commit_message(r, commit, format, &sb,
477 &ctx);
478 strbuf_addch(&sb, '\n');
479 if (commit->object.flags & SYMMETRIC_LEFT)
480 diff_emit_submodule_del(o, sb.buf);
481 else
482 diff_emit_submodule_add(o, sb.buf);
483 }
484 strbuf_release(&sb);
485 }
486
487 static void prepare_submodule_repo_env_no_git_dir(struct strvec *out)
488 {
489 const char * const *var;
490
491 for (var = local_repo_env; *var; var++) {
492 if (strcmp(*var, CONFIG_DATA_ENVIRONMENT))
493 strvec_push(out, *var);
494 }
495 }
496
497 void prepare_submodule_repo_env(struct strvec *out)
498 {
499 prepare_submodule_repo_env_no_git_dir(out);
500 strvec_pushf(out, "%s=%s", GIT_DIR_ENVIRONMENT,
501 DEFAULT_GIT_DIR_ENVIRONMENT);
502 }
503
504 static void prepare_submodule_repo_env_in_gitdir(struct strvec *out)
505 {
506 prepare_submodule_repo_env_no_git_dir(out);
507 strvec_pushf(out, "%s=.", GIT_DIR_ENVIRONMENT);
508 }
509
510 /*
511 * Initialize a repository struct for a submodule based on the provided 'path'.
512 *
513 * Unlike repo_submodule_init, this tolerates submodules not present
514 * in .gitmodules. This function exists only to preserve historical behavior,
515 *
516 * Returns the repository struct on success,
517 * NULL when the submodule is not present.
518 */
519 static struct repository *open_submodule(const char *path)
520 {
521 struct strbuf sb = STRBUF_INIT;
522 struct repository *out = xmalloc(sizeof(*out));
523
524 if (submodule_to_gitdir(&sb, path) || repo_init(out, sb.buf, NULL)) {
525 strbuf_release(&sb);
526 free(out);
527 return NULL;
528 }
529
530 /* Mark it as a submodule */
531 out->submodule_prefix = xstrdup(path);
532
533 strbuf_release(&sb);
534 return out;
535 }
536
537 /*
538 * Helper function to display the submodule header line prior to the full
539 * summary output.
540 *
541 * If it can locate the submodule git directory it will create a repository
542 * handle for the submodule and lookup both the left and right commits and
543 * put them into the left and right pointers.
544 */
545 static void show_submodule_header(struct diff_options *o,
546 const char *path,
547 struct object_id *one, struct object_id *two,
548 unsigned dirty_submodule,
549 struct repository *sub,
550 struct commit **left, struct commit **right,
551 struct commit_list **merge_bases)
552 {
553 const char *message = NULL;
554 struct strbuf sb = STRBUF_INIT;
555 int fast_forward = 0, fast_backward = 0;
556
557 if (dirty_submodule & DIRTY_SUBMODULE_UNTRACKED)
558 diff_emit_submodule_untracked(o, path);
559
560 if (dirty_submodule & DIRTY_SUBMODULE_MODIFIED)
561 diff_emit_submodule_modified(o, path);
562
563 if (is_null_oid(one))
564 message = "(new submodule)";
565 else if (is_null_oid(two))
566 message = "(submodule deleted)";
567
568 if (!sub) {
569 if (!message)
570 message = "(commits not present)";
571 goto output_header;
572 }
573
574 /*
575 * Attempt to lookup the commit references, and determine if this is
576 * a fast forward or fast backwards update.
577 */
578 *left = lookup_commit_reference(sub, one);
579 *right = lookup_commit_reference(sub, two);
580
581 /*
582 * Warn about missing commits in the submodule project, but only if
583 * they aren't null.
584 */
585 if ((!is_null_oid(one) && !*left) ||
586 (!is_null_oid(two) && !*right))
587 message = "(commits not present)";
588
589 *merge_bases = repo_get_merge_bases(sub, *left, *right);
590 if (*merge_bases) {
591 if ((*merge_bases)->item == *left)
592 fast_forward = 1;
593 else if ((*merge_bases)->item == *right)
594 fast_backward = 1;
595 }
596
597 if (oideq(one, two)) {
598 strbuf_release(&sb);
599 return;
600 }
601
602 output_header:
603 strbuf_addf(&sb, "Submodule %s ", path);
604 strbuf_add_unique_abbrev(&sb, one, DEFAULT_ABBREV);
605 strbuf_addstr(&sb, (fast_backward || fast_forward) ? ".." : "...");
606 strbuf_add_unique_abbrev(&sb, two, DEFAULT_ABBREV);
607 if (message)
608 strbuf_addf(&sb, " %s\n", message);
609 else
610 strbuf_addf(&sb, "%s:\n", fast_backward ? " (rewind)" : "");
611 diff_emit_submodule_header(o, sb.buf);
612
613 strbuf_release(&sb);
614 }
615
616 void show_submodule_diff_summary(struct diff_options *o, const char *path,
617 struct object_id *one, struct object_id *two,
618 unsigned dirty_submodule)
619 {
620 struct rev_info rev;
621 struct commit *left = NULL, *right = NULL;
622 struct commit_list *merge_bases = NULL;
623 struct repository *sub;
624
625 sub = open_submodule(path);
626 show_submodule_header(o, path, one, two, dirty_submodule,
627 sub, &left, &right, &merge_bases);
628
629 /*
630 * If we don't have both a left and a right pointer, there is no
631 * reason to try and display a summary. The header line should contain
632 * all the information the user needs.
633 */
634 if (!left || !right || !sub)
635 goto out;
636
637 /* Treat revision walker failure the same as missing commits */
638 if (prepare_submodule_diff_summary(sub, &rev, path, left, right, merge_bases)) {
639 diff_emit_submodule_error(o, "(revision walker failed)\n");
640 goto out;
641 }
642
643 print_submodule_diff_summary(sub, &rev, o);
644
645 out:
646 if (merge_bases)
647 free_commit_list(merge_bases);
648 clear_commit_marks(left, ~0);
649 clear_commit_marks(right, ~0);
650 if (sub) {
651 repo_clear(sub);
652 free(sub);
653 }
654 }
655
656 void show_submodule_inline_diff(struct diff_options *o, const char *path,
657 struct object_id *one, struct object_id *two,
658 unsigned dirty_submodule)
659 {
660 const struct object_id *old_oid = the_hash_algo->empty_tree, *new_oid = the_hash_algo->empty_tree;
661 struct commit *left = NULL, *right = NULL;
662 struct commit_list *merge_bases = NULL;
663 struct child_process cp = CHILD_PROCESS_INIT;
664 struct strbuf sb = STRBUF_INIT;
665 struct repository *sub;
666
667 sub = open_submodule(path);
668 show_submodule_header(o, path, one, two, dirty_submodule,
669 sub, &left, &right, &merge_bases);
670
671 /* We need a valid left and right commit to display a difference */
672 if (!(left || is_null_oid(one)) ||
673 !(right || is_null_oid(two)))
674 goto done;
675
676 if (left)
677 old_oid = one;
678 if (right)
679 new_oid = two;
680
681 cp.git_cmd = 1;
682 cp.dir = path;
683 cp.out = -1;
684 cp.no_stdin = 1;
685
686 /* TODO: other options may need to be passed here. */
687 strvec_pushl(&cp.args, "diff", "--submodule=diff", NULL);
688 strvec_pushf(&cp.args, "--color=%s", want_color(o->use_color) ?
689 "always" : "never");
690
691 if (o->flags.reverse_diff) {
692 strvec_pushf(&cp.args, "--src-prefix=%s%s/",
693 o->b_prefix, path);
694 strvec_pushf(&cp.args, "--dst-prefix=%s%s/",
695 o->a_prefix, path);
696 } else {
697 strvec_pushf(&cp.args, "--src-prefix=%s%s/",
698 o->a_prefix, path);
699 strvec_pushf(&cp.args, "--dst-prefix=%s%s/",
700 o->b_prefix, path);
701 }
702 strvec_push(&cp.args, oid_to_hex(old_oid));
703 /*
704 * If the submodule has modified content, we will diff against the
705 * work tree, under the assumption that the user has asked for the
706 * diff format and wishes to actually see all differences even if they
707 * haven't yet been committed to the submodule yet.
708 */
709 if (!(dirty_submodule & DIRTY_SUBMODULE_MODIFIED))
710 strvec_push(&cp.args, oid_to_hex(new_oid));
711
712 prepare_submodule_repo_env(&cp.env_array);
713 if (start_command(&cp))
714 diff_emit_submodule_error(o, "(diff failed)\n");
715
716 while (strbuf_getwholeline_fd(&sb, cp.out, '\n') != EOF)
717 diff_emit_submodule_pipethrough(o, sb.buf, sb.len);
718
719 if (finish_command(&cp))
720 diff_emit_submodule_error(o, "(diff failed)\n");
721
722 done:
723 strbuf_release(&sb);
724 if (merge_bases)
725 free_commit_list(merge_bases);
726 if (left)
727 clear_commit_marks(left, ~0);
728 if (right)
729 clear_commit_marks(right, ~0);
730 if (sub) {
731 repo_clear(sub);
732 free(sub);
733 }
734 }
735
736 int should_update_submodules(void)
737 {
738 return config_update_recurse_submodules == RECURSE_SUBMODULES_ON;
739 }
740
741 const struct submodule *submodule_from_ce(const struct cache_entry *ce)
742 {
743 if (!S_ISGITLINK(ce->ce_mode))
744 return NULL;
745
746 if (!should_update_submodules())
747 return NULL;
748
749 return submodule_from_path(the_repository, null_oid(), ce->name);
750 }
751
752 static struct oid_array *submodule_commits(struct string_list *submodules,
753 const char *name)
754 {
755 struct string_list_item *item;
756
757 item = string_list_insert(submodules, name);
758 if (item->util)
759 return (struct oid_array *) item->util;
760
761 /* NEEDSWORK: should we have oid_array_init()? */
762 item->util = xcalloc(1, sizeof(struct oid_array));
763 return (struct oid_array *) item->util;
764 }
765
766 struct collect_changed_submodules_cb_data {
767 struct repository *repo;
768 struct string_list *changed;
769 const struct object_id *commit_oid;
770 };
771
772 /*
773 * this would normally be two functions: default_name_from_path() and
774 * path_from_default_name(). Since the default name is the same as
775 * the submodule path we can get away with just one function which only
776 * checks whether there is a submodule in the working directory at that
777 * location.
778 */
779 static const char *default_name_or_path(const char *path_or_name)
780 {
781 int error_code;
782
783 if (!is_submodule_populated_gently(path_or_name, &error_code))
784 return NULL;
785
786 return path_or_name;
787 }
788
789 static void collect_changed_submodules_cb(struct diff_queue_struct *q,
790 struct diff_options *options,
791 void *data)
792 {
793 struct collect_changed_submodules_cb_data *me = data;
794 struct string_list *changed = me->changed;
795 const struct object_id *commit_oid = me->commit_oid;
796 int i;
797
798 for (i = 0; i < q->nr; i++) {
799 struct diff_filepair *p = q->queue[i];
800 struct oid_array *commits;
801 const struct submodule *submodule;
802 const char *name;
803
804 if (!S_ISGITLINK(p->two->mode))
805 continue;
806
807 submodule = submodule_from_path(me->repo,
808 commit_oid, p->two->path);
809 if (submodule)
810 name = submodule->name;
811 else {
812 name = default_name_or_path(p->two->path);
813 /* make sure name does not collide with existing one */
814 if (name)
815 submodule = submodule_from_name(me->repo,
816 commit_oid, name);
817 if (submodule) {
818 warning(_("Submodule in commit %s at path: "
819 "'%s' collides with a submodule named "
820 "the same. Skipping it."),
821 oid_to_hex(commit_oid), p->two->path);
822 name = NULL;
823 }
824 }
825
826 if (!name)
827 continue;
828
829 commits = submodule_commits(changed, name);
830 oid_array_append(commits, &p->two->oid);
831 }
832 }
833
834 /*
835 * Collect the paths of submodules in 'changed' which have changed based on
836 * the revisions as specified in 'argv'. Each entry in 'changed' will also
837 * have a corresponding 'struct oid_array' (in the 'util' field) which lists
838 * what the submodule pointers were updated to during the change.
839 */
840 static void collect_changed_submodules(struct repository *r,
841 struct string_list *changed,
842 struct strvec *argv)
843 {
844 struct rev_info rev;
845 const struct commit *commit;
846 int save_warning;
847 struct setup_revision_opt s_r_opt = {
848 .assume_dashdash = 1,
849 };
850
851 save_warning = warn_on_object_refname_ambiguity;
852 warn_on_object_refname_ambiguity = 0;
853 repo_init_revisions(r, &rev, NULL);
854 setup_revisions(argv->nr, argv->v, &rev, &s_r_opt);
855 warn_on_object_refname_ambiguity = save_warning;
856 if (prepare_revision_walk(&rev))
857 die(_("revision walk setup failed"));
858
859 while ((commit = get_revision(&rev))) {
860 struct rev_info diff_rev;
861 struct collect_changed_submodules_cb_data data;
862 data.repo = r;
863 data.changed = changed;
864 data.commit_oid = &commit->object.oid;
865
866 repo_init_revisions(r, &diff_rev, NULL);
867 diff_rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
868 diff_rev.diffopt.format_callback = collect_changed_submodules_cb;
869 diff_rev.diffopt.format_callback_data = &data;
870 diff_rev.dense_combined_merges = 1;
871 diff_tree_combined_merge(commit, &diff_rev);
872 }
873
874 reset_revision_walk();
875 }
876
877 static void free_submodules_oids(struct string_list *submodules)
878 {
879 struct string_list_item *item;
880 for_each_string_list_item(item, submodules)
881 oid_array_clear((struct oid_array *) item->util);
882 string_list_clear(submodules, 1);
883 }
884
885 static int has_remote(const char *refname, const struct object_id *oid,
886 int flags, void *cb_data)
887 {
888 return 1;
889 }
890
891 static int append_oid_to_argv(const struct object_id *oid, void *data)
892 {
893 struct strvec *argv = data;
894 strvec_push(argv, oid_to_hex(oid));
895 return 0;
896 }
897
898 struct has_commit_data {
899 struct repository *repo;
900 int result;
901 const char *path;
902 };
903
904 static int check_has_commit(const struct object_id *oid, void *data)
905 {
906 struct has_commit_data *cb = data;
907
908 enum object_type type = oid_object_info(cb->repo, oid, NULL);
909
910 switch (type) {
911 case OBJ_COMMIT:
912 return 0;
913 case OBJ_BAD:
914 /*
915 * Object is missing or invalid. If invalid, an error message
916 * has already been printed.
917 */
918 cb->result = 0;
919 return 0;
920 default:
921 die(_("submodule entry '%s' (%s) is a %s, not a commit"),
922 cb->path, oid_to_hex(oid), type_name(type));
923 }
924 }
925
926 static int submodule_has_commits(struct repository *r,
927 const char *path,
928 struct oid_array *commits)
929 {
930 struct has_commit_data has_commit = { r, 1, path };
931
932 /*
933 * Perform a cheap, but incorrect check for the existence of 'commits'.
934 * This is done by adding the submodule's object store to the in-core
935 * object store, and then querying for each commit's existence. If we
936 * do not have the commit object anywhere, there is no chance we have
937 * it in the object store of the correct submodule and have it
938 * reachable from a ref, so we can fail early without spawning rev-list
939 * which is expensive.
940 */
941 if (add_submodule_odb(path))
942 return 0;
943
944 oid_array_for_each_unique(commits, check_has_commit, &has_commit);
945
946 if (has_commit.result) {
947 /*
948 * Even if the submodule is checked out and the commit is
949 * present, make sure it exists in the submodule's object store
950 * and that it is reachable from a ref.
951 */
952 struct child_process cp = CHILD_PROCESS_INIT;
953 struct strbuf out = STRBUF_INIT;
954
955 strvec_pushl(&cp.args, "rev-list", "-n", "1", NULL);
956 oid_array_for_each_unique(commits, append_oid_to_argv, &cp.args);
957 strvec_pushl(&cp.args, "--not", "--all", NULL);
958
959 prepare_submodule_repo_env(&cp.env_array);
960 cp.git_cmd = 1;
961 cp.no_stdin = 1;
962 cp.dir = path;
963
964 if (capture_command(&cp, &out, GIT_MAX_HEXSZ + 1) || out.len)
965 has_commit.result = 0;
966
967 strbuf_release(&out);
968 }
969
970 return has_commit.result;
971 }
972
973 static int submodule_needs_pushing(struct repository *r,
974 const char *path,
975 struct oid_array *commits)
976 {
977 if (!submodule_has_commits(r, path, commits))
978 /*
979 * NOTE: We do consider it safe to return "no" here. The
980 * correct answer would be "We do not know" instead of
981 * "No push needed", but it is quite hard to change
982 * the submodule pointer without having the submodule
983 * around. If a user did however change the submodules
984 * without having the submodule around, this indicates
985 * an expert who knows what they are doing or a
986 * maintainer integrating work from other people. In
987 * both cases it should be safe to skip this check.
988 */
989 return 0;
990
991 if (for_each_remote_ref_submodule(path, has_remote, NULL) > 0) {
992 struct child_process cp = CHILD_PROCESS_INIT;
993 struct strbuf buf = STRBUF_INIT;
994 int needs_pushing = 0;
995
996 strvec_push(&cp.args, "rev-list");
997 oid_array_for_each_unique(commits, append_oid_to_argv, &cp.args);
998 strvec_pushl(&cp.args, "--not", "--remotes", "-n", "1" , NULL);
999
1000 prepare_submodule_repo_env(&cp.env_array);
1001 cp.git_cmd = 1;
1002 cp.no_stdin = 1;
1003 cp.out = -1;
1004 cp.dir = path;
1005 if (start_command(&cp))
1006 die(_("Could not run 'git rev-list <commits> --not --remotes -n 1' command in submodule %s"),
1007 path);
1008 if (strbuf_read(&buf, cp.out, the_hash_algo->hexsz + 1))
1009 needs_pushing = 1;
1010 finish_command(&cp);
1011 close(cp.out);
1012 strbuf_release(&buf);
1013 return needs_pushing;
1014 }
1015
1016 return 0;
1017 }
1018
1019 int find_unpushed_submodules(struct repository *r,
1020 struct oid_array *commits,
1021 const char *remotes_name,
1022 struct string_list *needs_pushing)
1023 {
1024 struct string_list submodules = STRING_LIST_INIT_DUP;
1025 struct string_list_item *name;
1026 struct strvec argv = STRVEC_INIT;
1027
1028 /* argv.v[0] will be ignored by setup_revisions */
1029 strvec_push(&argv, "find_unpushed_submodules");
1030 oid_array_for_each_unique(commits, append_oid_to_argv, &argv);
1031 strvec_push(&argv, "--not");
1032 strvec_pushf(&argv, "--remotes=%s", remotes_name);
1033
1034 collect_changed_submodules(r, &submodules, &argv);
1035
1036 for_each_string_list_item(name, &submodules) {
1037 struct oid_array *commits = name->util;
1038 const struct submodule *submodule;
1039 const char *path = NULL;
1040
1041 submodule = submodule_from_name(r, null_oid(), name->string);
1042 if (submodule)
1043 path = submodule->path;
1044 else
1045 path = default_name_or_path(name->string);
1046
1047 if (!path)
1048 continue;
1049
1050 if (submodule_needs_pushing(r, path, commits))
1051 string_list_insert(needs_pushing, path);
1052 }
1053
1054 free_submodules_oids(&submodules);
1055 strvec_clear(&argv);
1056
1057 return needs_pushing->nr;
1058 }
1059
1060 static int push_submodule(const char *path,
1061 const struct remote *remote,
1062 const struct refspec *rs,
1063 const struct string_list *push_options,
1064 int dry_run)
1065 {
1066 if (for_each_remote_ref_submodule(path, has_remote, NULL) > 0) {
1067 struct child_process cp = CHILD_PROCESS_INIT;
1068 strvec_push(&cp.args, "push");
1069 if (dry_run)
1070 strvec_push(&cp.args, "--dry-run");
1071
1072 if (push_options && push_options->nr) {
1073 const struct string_list_item *item;
1074 for_each_string_list_item(item, push_options)
1075 strvec_pushf(&cp.args, "--push-option=%s",
1076 item->string);
1077 }
1078
1079 if (remote->origin != REMOTE_UNCONFIGURED) {
1080 int i;
1081 strvec_push(&cp.args, remote->name);
1082 for (i = 0; i < rs->raw_nr; i++)
1083 strvec_push(&cp.args, rs->raw[i]);
1084 }
1085
1086 prepare_submodule_repo_env(&cp.env_array);
1087 cp.git_cmd = 1;
1088 cp.no_stdin = 1;
1089 cp.dir = path;
1090 if (run_command(&cp))
1091 return 0;
1092 close(cp.out);
1093 }
1094
1095 return 1;
1096 }
1097
1098 /*
1099 * Perform a check in the submodule to see if the remote and refspec work.
1100 * Die if the submodule can't be pushed.
1101 */
1102 static void submodule_push_check(const char *path, const char *head,
1103 const struct remote *remote,
1104 const struct refspec *rs)
1105 {
1106 struct child_process cp = CHILD_PROCESS_INIT;
1107 int i;
1108
1109 strvec_push(&cp.args, "submodule--helper");
1110 strvec_push(&cp.args, "push-check");
1111 strvec_push(&cp.args, head);
1112 strvec_push(&cp.args, remote->name);
1113
1114 for (i = 0; i < rs->raw_nr; i++)
1115 strvec_push(&cp.args, rs->raw[i]);
1116
1117 prepare_submodule_repo_env(&cp.env_array);
1118 cp.git_cmd = 1;
1119 cp.no_stdin = 1;
1120 cp.no_stdout = 1;
1121 cp.dir = path;
1122
1123 /*
1124 * Simply indicate if 'submodule--helper push-check' failed.
1125 * More detailed error information will be provided by the
1126 * child process.
1127 */
1128 if (run_command(&cp))
1129 die(_("process for submodule '%s' failed"), path);
1130 }
1131
1132 int push_unpushed_submodules(struct repository *r,
1133 struct oid_array *commits,
1134 const struct remote *remote,
1135 const struct refspec *rs,
1136 const struct string_list *push_options,
1137 int dry_run)
1138 {
1139 int i, ret = 1;
1140 struct string_list needs_pushing = STRING_LIST_INIT_DUP;
1141
1142 if (!find_unpushed_submodules(r, commits,
1143 remote->name, &needs_pushing))
1144 return 1;
1145
1146 /*
1147 * Verify that the remote and refspec can be propagated to all
1148 * submodules. This check can be skipped if the remote and refspec
1149 * won't be propagated due to the remote being unconfigured (e.g. a URL
1150 * instead of a remote name).
1151 */
1152 if (remote->origin != REMOTE_UNCONFIGURED) {
1153 char *head;
1154 struct object_id head_oid;
1155
1156 head = resolve_refdup("HEAD", 0, &head_oid, NULL);
1157 if (!head)
1158 die(_("Failed to resolve HEAD as a valid ref."));
1159
1160 for (i = 0; i < needs_pushing.nr; i++)
1161 submodule_push_check(needs_pushing.items[i].string,
1162 head, remote, rs);
1163 free(head);
1164 }
1165
1166 /* Actually push the submodules */
1167 for (i = 0; i < needs_pushing.nr; i++) {
1168 const char *path = needs_pushing.items[i].string;
1169 fprintf(stderr, _("Pushing submodule '%s'\n"), path);
1170 if (!push_submodule(path, remote, rs,
1171 push_options, dry_run)) {
1172 fprintf(stderr, _("Unable to push submodule '%s'\n"), path);
1173 ret = 0;
1174 }
1175 }
1176
1177 string_list_clear(&needs_pushing, 0);
1178
1179 return ret;
1180 }
1181
1182 static int append_oid_to_array(const char *ref, const struct object_id *oid,
1183 int flags, void *data)
1184 {
1185 struct oid_array *array = data;
1186 oid_array_append(array, oid);
1187 return 0;
1188 }
1189
1190 void check_for_new_submodule_commits(struct object_id *oid)
1191 {
1192 if (!initialized_fetch_ref_tips) {
1193 for_each_ref(append_oid_to_array, &ref_tips_before_fetch);
1194 initialized_fetch_ref_tips = 1;
1195 }
1196
1197 oid_array_append(&ref_tips_after_fetch, oid);
1198 }
1199
1200 static void calculate_changed_submodule_paths(struct repository *r,
1201 struct string_list *changed_submodule_names)
1202 {
1203 struct strvec argv = STRVEC_INIT;
1204 struct string_list_item *name;
1205
1206 /* No need to check if there are no submodules configured */
1207 if (!submodule_from_path(r, NULL, NULL))
1208 return;
1209
1210 strvec_push(&argv, "--"); /* argv[0] program name */
1211 oid_array_for_each_unique(&ref_tips_after_fetch,
1212 append_oid_to_argv, &argv);
1213 strvec_push(&argv, "--not");
1214 oid_array_for_each_unique(&ref_tips_before_fetch,
1215 append_oid_to_argv, &argv);
1216
1217 /*
1218 * Collect all submodules (whether checked out or not) for which new
1219 * commits have been recorded upstream in "changed_submodule_names".
1220 */
1221 collect_changed_submodules(r, changed_submodule_names, &argv);
1222
1223 for_each_string_list_item(name, changed_submodule_names) {
1224 struct oid_array *commits = name->util;
1225 const struct submodule *submodule;
1226 const char *path = NULL;
1227
1228 submodule = submodule_from_name(r, null_oid(), name->string);
1229 if (submodule)
1230 path = submodule->path;
1231 else
1232 path = default_name_or_path(name->string);
1233
1234 if (!path)
1235 continue;
1236
1237 if (submodule_has_commits(r, path, commits)) {
1238 oid_array_clear(commits);
1239 *name->string = '\0';
1240 }
1241 }
1242
1243 string_list_remove_empty_items(changed_submodule_names, 1);
1244
1245 strvec_clear(&argv);
1246 oid_array_clear(&ref_tips_before_fetch);
1247 oid_array_clear(&ref_tips_after_fetch);
1248 initialized_fetch_ref_tips = 0;
1249 }
1250
1251 int submodule_touches_in_range(struct repository *r,
1252 struct object_id *excl_oid,
1253 struct object_id *incl_oid)
1254 {
1255 struct string_list subs = STRING_LIST_INIT_DUP;
1256 struct strvec args = STRVEC_INIT;
1257 int ret;
1258
1259 /* No need to check if there are no submodules configured */
1260 if (!submodule_from_path(r, NULL, NULL))
1261 return 0;
1262
1263 strvec_push(&args, "--"); /* args[0] program name */
1264 strvec_push(&args, oid_to_hex(incl_oid));
1265 if (!is_null_oid(excl_oid)) {
1266 strvec_push(&args, "--not");
1267 strvec_push(&args, oid_to_hex(excl_oid));
1268 }
1269
1270 collect_changed_submodules(r, &subs, &args);
1271 ret = subs.nr;
1272
1273 strvec_clear(&args);
1274
1275 free_submodules_oids(&subs);
1276 return ret;
1277 }
1278
1279 struct submodule_parallel_fetch {
1280 int count;
1281 struct strvec args;
1282 struct repository *r;
1283 const char *prefix;
1284 int command_line_option;
1285 int default_option;
1286 int quiet;
1287 int result;
1288
1289 struct string_list changed_submodule_names;
1290
1291 /* Pending fetches by OIDs */
1292 struct fetch_task **oid_fetch_tasks;
1293 int oid_fetch_tasks_nr, oid_fetch_tasks_alloc;
1294
1295 struct strbuf submodules_with_errors;
1296 };
1297 #define SPF_INIT {0, STRVEC_INIT, NULL, NULL, 0, 0, 0, 0, \
1298 STRING_LIST_INIT_DUP, \
1299 NULL, 0, 0, STRBUF_INIT}
1300
1301 static int get_fetch_recurse_config(const struct submodule *submodule,
1302 struct submodule_parallel_fetch *spf)
1303 {
1304 if (spf->command_line_option != RECURSE_SUBMODULES_DEFAULT)
1305 return spf->command_line_option;
1306
1307 if (submodule) {
1308 char *key;
1309 const char *value;
1310
1311 int fetch_recurse = submodule->fetch_recurse;
1312 key = xstrfmt("submodule.%s.fetchRecurseSubmodules", submodule->name);
1313 if (!repo_config_get_string_tmp(spf->r, key, &value)) {
1314 fetch_recurse = parse_fetch_recurse_submodules_arg(key, value);
1315 }
1316 free(key);
1317
1318 if (fetch_recurse != RECURSE_SUBMODULES_NONE)
1319 /* local config overrules everything except commandline */
1320 return fetch_recurse;
1321 }
1322
1323 return spf->default_option;
1324 }
1325
1326 /*
1327 * Fetch in progress (if callback data) or
1328 * pending (if in oid_fetch_tasks in struct submodule_parallel_fetch)
1329 */
1330 struct fetch_task {
1331 struct repository *repo;
1332 const struct submodule *sub;
1333 unsigned free_sub : 1; /* Do we need to free the submodule? */
1334
1335 struct oid_array *commits; /* Ensure these commits are fetched */
1336 };
1337
1338 /**
1339 * When a submodule is not defined in .gitmodules, we cannot access it
1340 * via the regular submodule-config. Create a fake submodule, which we can
1341 * work on.
1342 */
1343 static const struct submodule *get_non_gitmodules_submodule(const char *path)
1344 {
1345 struct submodule *ret = NULL;
1346 const char *name = default_name_or_path(path);
1347
1348 if (!name)
1349 return NULL;
1350
1351 ret = xmalloc(sizeof(*ret));
1352 memset(ret, 0, sizeof(*ret));
1353 ret->path = name;
1354 ret->name = name;
1355
1356 return (const struct submodule *) ret;
1357 }
1358
1359 static struct fetch_task *fetch_task_create(struct repository *r,
1360 const char *path)
1361 {
1362 struct fetch_task *task = xmalloc(sizeof(*task));
1363 memset(task, 0, sizeof(*task));
1364
1365 task->sub = submodule_from_path(r, null_oid(), path);
1366 if (!task->sub) {
1367 /*
1368 * No entry in .gitmodules? Technically not a submodule,
1369 * but historically we supported repositories that happen to be
1370 * in-place where a gitlink is. Keep supporting them.
1371 */
1372 task->sub = get_non_gitmodules_submodule(path);
1373 if (!task->sub) {
1374 free(task);
1375 return NULL;
1376 }
1377
1378 task->free_sub = 1;
1379 }
1380
1381 return task;
1382 }
1383
1384 static void fetch_task_release(struct fetch_task *p)
1385 {
1386 if (p->free_sub)
1387 free((void*)p->sub);
1388 p->free_sub = 0;
1389 p->sub = NULL;
1390
1391 if (p->repo)
1392 repo_clear(p->repo);
1393 FREE_AND_NULL(p->repo);
1394 }
1395
1396 static struct repository *get_submodule_repo_for(struct repository *r,
1397 const struct submodule *sub)
1398 {
1399 struct repository *ret = xmalloc(sizeof(*ret));
1400
1401 if (repo_submodule_init(ret, r, sub)) {
1402 /*
1403 * No entry in .gitmodules? Technically not a submodule,
1404 * but historically we supported repositories that happen to be
1405 * in-place where a gitlink is. Keep supporting them.
1406 */
1407 struct strbuf gitdir = STRBUF_INIT;
1408 strbuf_repo_worktree_path(&gitdir, r, "%s/.git", sub->path);
1409 if (repo_init(ret, gitdir.buf, NULL)) {
1410 strbuf_release(&gitdir);
1411 free(ret);
1412 return NULL;
1413 }
1414 strbuf_release(&gitdir);
1415 }
1416
1417 return ret;
1418 }
1419
1420 static int get_next_submodule(struct child_process *cp,
1421 struct strbuf *err, void *data, void **task_cb)
1422 {
1423 struct submodule_parallel_fetch *spf = data;
1424
1425 for (; spf->count < spf->r->index->cache_nr; spf->count++) {
1426 const struct cache_entry *ce = spf->r->index->cache[spf->count];
1427 const char *default_argv;
1428 struct fetch_task *task;
1429
1430 if (!S_ISGITLINK(ce->ce_mode))
1431 continue;
1432
1433 task = fetch_task_create(spf->r, ce->name);
1434 if (!task)
1435 continue;
1436
1437 switch (get_fetch_recurse_config(task->sub, spf))
1438 {
1439 default:
1440 case RECURSE_SUBMODULES_DEFAULT:
1441 case RECURSE_SUBMODULES_ON_DEMAND:
1442 if (!task->sub ||
1443 !string_list_lookup(
1444 &spf->changed_submodule_names,
1445 task->sub->name))
1446 continue;
1447 default_argv = "on-demand";
1448 break;
1449 case RECURSE_SUBMODULES_ON:
1450 default_argv = "yes";
1451 break;
1452 case RECURSE_SUBMODULES_OFF:
1453 continue;
1454 }
1455
1456 task->repo = get_submodule_repo_for(spf->r, task->sub);
1457 if (task->repo) {
1458 struct strbuf submodule_prefix = STRBUF_INIT;
1459 child_process_init(cp);
1460 cp->dir = task->repo->gitdir;
1461 prepare_submodule_repo_env_in_gitdir(&cp->env_array);
1462 cp->git_cmd = 1;
1463 if (!spf->quiet)
1464 strbuf_addf(err, _("Fetching submodule %s%s\n"),
1465 spf->prefix, ce->name);
1466 strvec_init(&cp->args);
1467 strvec_pushv(&cp->args, spf->args.v);
1468 strvec_push(&cp->args, default_argv);
1469 strvec_push(&cp->args, "--submodule-prefix");
1470
1471 strbuf_addf(&submodule_prefix, "%s%s/",
1472 spf->prefix,
1473 task->sub->path);
1474 strvec_push(&cp->args, submodule_prefix.buf);
1475
1476 spf->count++;
1477 *task_cb = task;
1478
1479 strbuf_release(&submodule_prefix);
1480 return 1;
1481 } else {
1482 struct strbuf empty_submodule_path = STRBUF_INIT;
1483
1484 fetch_task_release(task);
1485 free(task);
1486
1487 /*
1488 * An empty directory is normal,
1489 * the submodule is not initialized
1490 */
1491 strbuf_addf(&empty_submodule_path, "%s/%s/",
1492 spf->r->worktree,
1493 ce->name);
1494 if (S_ISGITLINK(ce->ce_mode) &&
1495 !is_empty_dir(empty_submodule_path.buf)) {
1496 spf->result = 1;
1497 strbuf_addf(err,
1498 _("Could not access submodule '%s'\n"),
1499 ce->name);
1500 }
1501 strbuf_release(&empty_submodule_path);
1502 }
1503 }
1504
1505 if (spf->oid_fetch_tasks_nr) {
1506 struct fetch_task *task =
1507 spf->oid_fetch_tasks[spf->oid_fetch_tasks_nr - 1];
1508 struct strbuf submodule_prefix = STRBUF_INIT;
1509 spf->oid_fetch_tasks_nr--;
1510
1511 strbuf_addf(&submodule_prefix, "%s%s/",
1512 spf->prefix, task->sub->path);
1513
1514 child_process_init(cp);
1515 prepare_submodule_repo_env_in_gitdir(&cp->env_array);
1516 cp->git_cmd = 1;
1517 cp->dir = task->repo->gitdir;
1518
1519 strvec_init(&cp->args);
1520 strvec_pushv(&cp->args, spf->args.v);
1521 strvec_push(&cp->args, "on-demand");
1522 strvec_push(&cp->args, "--submodule-prefix");
1523 strvec_push(&cp->args, submodule_prefix.buf);
1524
1525 /* NEEDSWORK: have get_default_remote from submodule--helper */
1526 strvec_push(&cp->args, "origin");
1527 oid_array_for_each_unique(task->commits,
1528 append_oid_to_argv, &cp->args);
1529
1530 *task_cb = task;
1531 strbuf_release(&submodule_prefix);
1532 return 1;
1533 }
1534
1535 return 0;
1536 }
1537
1538 static int fetch_start_failure(struct strbuf *err,
1539 void *cb, void *task_cb)
1540 {
1541 struct submodule_parallel_fetch *spf = cb;
1542 struct fetch_task *task = task_cb;
1543
1544 spf->result = 1;
1545
1546 fetch_task_release(task);
1547 return 0;
1548 }
1549
1550 static int commit_missing_in_sub(const struct object_id *oid, void *data)
1551 {
1552 struct repository *subrepo = data;
1553
1554 enum object_type type = oid_object_info(subrepo, oid, NULL);
1555
1556 return type != OBJ_COMMIT;
1557 }
1558
1559 static int fetch_finish(int retvalue, struct strbuf *err,
1560 void *cb, void *task_cb)
1561 {
1562 struct submodule_parallel_fetch *spf = cb;
1563 struct fetch_task *task = task_cb;
1564
1565 struct string_list_item *it;
1566 struct oid_array *commits;
1567
1568 if (!task || !task->sub)
1569 BUG("callback cookie bogus");
1570
1571 if (retvalue) {
1572 /*
1573 * NEEDSWORK: This indicates that the overall fetch
1574 * failed, even though there may be a subsequent fetch
1575 * by commit hash that might work. It may be a good
1576 * idea to not indicate failure in this case, and only
1577 * indicate failure if the subsequent fetch fails.
1578 */
1579 spf->result = 1;
1580
1581 strbuf_addf(&spf->submodules_with_errors, "\t%s\n",
1582 task->sub->name);
1583 }
1584
1585 /* Is this the second time we process this submodule? */
1586 if (task->commits)
1587 goto out;
1588
1589 it = string_list_lookup(&spf->changed_submodule_names, task->sub->name);
1590 if (!it)
1591 /* Could be an unchanged submodule, not contained in the list */
1592 goto out;
1593
1594 commits = it->util;
1595 oid_array_filter(commits,
1596 commit_missing_in_sub,
1597 task->repo);
1598
1599 /* Are there commits we want, but do not exist? */
1600 if (commits->nr) {
1601 task->commits = commits;
1602 ALLOC_GROW(spf->oid_fetch_tasks,
1603 spf->oid_fetch_tasks_nr + 1,
1604 spf->oid_fetch_tasks_alloc);
1605 spf->oid_fetch_tasks[spf->oid_fetch_tasks_nr] = task;
1606 spf->oid_fetch_tasks_nr++;
1607 return 0;
1608 }
1609
1610 out:
1611 fetch_task_release(task);
1612
1613 return 0;
1614 }
1615
1616 int fetch_populated_submodules(struct repository *r,
1617 const struct strvec *options,
1618 const char *prefix, int command_line_option,
1619 int default_option,
1620 int quiet, int max_parallel_jobs)
1621 {
1622 int i;
1623 struct submodule_parallel_fetch spf = SPF_INIT;
1624
1625 spf.r = r;
1626 spf.command_line_option = command_line_option;
1627 spf.default_option = default_option;
1628 spf.quiet = quiet;
1629 spf.prefix = prefix;
1630
1631 if (!r->worktree)
1632 goto out;
1633
1634 if (repo_read_index(r) < 0)
1635 die(_("index file corrupt"));
1636
1637 strvec_push(&spf.args, "fetch");
1638 for (i = 0; i < options->nr; i++)
1639 strvec_push(&spf.args, options->v[i]);
1640 strvec_push(&spf.args, "--recurse-submodules-default");
1641 /* default value, "--submodule-prefix" and its value are added later */
1642
1643 calculate_changed_submodule_paths(r, &spf.changed_submodule_names);
1644 string_list_sort(&spf.changed_submodule_names);
1645 run_processes_parallel_tr2(max_parallel_jobs,
1646 get_next_submodule,
1647 fetch_start_failure,
1648 fetch_finish,
1649 &spf,
1650 "submodule", "parallel/fetch");
1651
1652 if (spf.submodules_with_errors.len > 0)
1653 fprintf(stderr, _("Errors during submodule fetch:\n%s"),
1654 spf.submodules_with_errors.buf);
1655
1656
1657 strvec_clear(&spf.args);
1658 out:
1659 free_submodules_oids(&spf.changed_submodule_names);
1660 return spf.result;
1661 }
1662
1663 unsigned is_submodule_modified(const char *path, int ignore_untracked)
1664 {
1665 struct child_process cp = CHILD_PROCESS_INIT;
1666 struct strbuf buf = STRBUF_INIT;
1667 FILE *fp;
1668 unsigned dirty_submodule = 0;
1669 const char *git_dir;
1670 int ignore_cp_exit_code = 0;
1671
1672 strbuf_addf(&buf, "%s/.git", path);
1673 git_dir = read_gitfile(buf.buf);
1674 if (!git_dir)
1675 git_dir = buf.buf;
1676 if (!is_git_directory(git_dir)) {
1677 if (is_directory(git_dir))
1678 die(_("'%s' not recognized as a git repository"), git_dir);
1679 strbuf_release(&buf);
1680 /* The submodule is not checked out, so it is not modified */
1681 return 0;
1682 }
1683 strbuf_reset(&buf);
1684
1685 strvec_pushl(&cp.args, "status", "--porcelain=2", NULL);
1686 if (ignore_untracked)
1687 strvec_push(&cp.args, "-uno");
1688
1689 prepare_submodule_repo_env(&cp.env_array);
1690 cp.git_cmd = 1;
1691 cp.no_stdin = 1;
1692 cp.out = -1;
1693 cp.dir = path;
1694 if (start_command(&cp))
1695 die(_("Could not run 'git status --porcelain=2' in submodule %s"), path);
1696
1697 fp = xfdopen(cp.out, "r");
1698 while (strbuf_getwholeline(&buf, fp, '\n') != EOF) {
1699 /* regular untracked files */
1700 if (buf.buf[0] == '?')
1701 dirty_submodule |= DIRTY_SUBMODULE_UNTRACKED;
1702
1703 if (buf.buf[0] == 'u' ||
1704 buf.buf[0] == '1' ||
1705 buf.buf[0] == '2') {
1706 /* T = line type, XY = status, SSSS = submodule state */
1707 if (buf.len < strlen("T XY SSSS"))
1708 BUG("invalid status --porcelain=2 line %s",
1709 buf.buf);
1710
1711 if (buf.buf[5] == 'S' && buf.buf[8] == 'U')
1712 /* nested untracked file */
1713 dirty_submodule |= DIRTY_SUBMODULE_UNTRACKED;
1714
1715 if (buf.buf[0] == 'u' ||
1716 buf.buf[0] == '2' ||
1717 memcmp(buf.buf + 5, "S..U", 4))
1718 /* other change */
1719 dirty_submodule |= DIRTY_SUBMODULE_MODIFIED;
1720 }
1721
1722 if ((dirty_submodule & DIRTY_SUBMODULE_MODIFIED) &&
1723 ((dirty_submodule & DIRTY_SUBMODULE_UNTRACKED) ||
1724 ignore_untracked)) {
1725 /*
1726 * We're not interested in any further information from
1727 * the child any more, neither output nor its exit code.
1728 */
1729 ignore_cp_exit_code = 1;
1730 break;
1731 }
1732 }
1733 fclose(fp);
1734
1735 if (finish_command(&cp) && !ignore_cp_exit_code)
1736 die(_("'git status --porcelain=2' failed in submodule %s"), path);
1737
1738 strbuf_release(&buf);
1739 return dirty_submodule;
1740 }
1741
1742 int submodule_uses_gitfile(const char *path)
1743 {
1744 struct child_process cp = CHILD_PROCESS_INIT;
1745 struct strbuf buf = STRBUF_INIT;
1746 const char *git_dir;
1747
1748 strbuf_addf(&buf, "%s/.git", path);
1749 git_dir = read_gitfile(buf.buf);
1750 if (!git_dir) {
1751 strbuf_release(&buf);
1752 return 0;
1753 }
1754 strbuf_release(&buf);
1755
1756 /* Now test that all nested submodules use a gitfile too */
1757 strvec_pushl(&cp.args,
1758 "submodule", "foreach", "--quiet", "--recursive",
1759 "test -f .git", NULL);
1760
1761 prepare_submodule_repo_env(&cp.env_array);
1762 cp.git_cmd = 1;
1763 cp.no_stdin = 1;
1764 cp.no_stderr = 1;
1765 cp.no_stdout = 1;
1766 cp.dir = path;
1767 if (run_command(&cp))
1768 return 0;
1769
1770 return 1;
1771 }
1772
1773 /*
1774 * Check if it is a bad idea to remove a submodule, i.e. if we'd lose data
1775 * when doing so.
1776 *
1777 * Return 1 if we'd lose data, return 0 if the removal is fine,
1778 * and negative values for errors.
1779 */
1780 int bad_to_remove_submodule(const char *path, unsigned flags)
1781 {
1782 ssize_t len;
1783 struct child_process cp = CHILD_PROCESS_INIT;
1784 struct strbuf buf = STRBUF_INIT;
1785 int ret = 0;
1786
1787 if (!file_exists(path) || is_empty_dir(path))
1788 return 0;
1789
1790 if (!submodule_uses_gitfile(path))
1791 return 1;
1792
1793 strvec_pushl(&cp.args, "status", "--porcelain",
1794 "--ignore-submodules=none", NULL);
1795
1796 if (flags & SUBMODULE_REMOVAL_IGNORE_UNTRACKED)
1797 strvec_push(&cp.args, "-uno");
1798 else
1799 strvec_push(&cp.args, "-uall");
1800
1801 if (!(flags & SUBMODULE_REMOVAL_IGNORE_IGNORED_UNTRACKED))
1802 strvec_push(&cp.args, "--ignored");
1803
1804 prepare_submodule_repo_env(&cp.env_array);
1805 cp.git_cmd = 1;
1806 cp.no_stdin = 1;
1807 cp.out = -1;
1808 cp.dir = path;
1809 if (start_command(&cp)) {
1810 if (flags & SUBMODULE_REMOVAL_DIE_ON_ERROR)
1811 die(_("could not start 'git status' in submodule '%s'"),
1812 path);
1813 ret = -1;
1814 goto out;
1815 }
1816
1817 len = strbuf_read(&buf, cp.out, 1024);
1818 if (len > 2)
1819 ret = 1;
1820 close(cp.out);
1821
1822 if (finish_command(&cp)) {
1823 if (flags & SUBMODULE_REMOVAL_DIE_ON_ERROR)
1824 die(_("could not run 'git status' in submodule '%s'"),
1825 path);
1826 ret = -1;
1827 }
1828 out:
1829 strbuf_release(&buf);
1830 return ret;
1831 }
1832
1833 void submodule_unset_core_worktree(const struct submodule *sub)
1834 {
1835 char *config_path = xstrfmt("%s/modules/%s/config",
1836 get_git_dir(), sub->name);
1837
1838 if (git_config_set_in_file_gently(config_path, "core.worktree", NULL))
1839 warning(_("Could not unset core.worktree setting in submodule '%s'"),
1840 sub->path);
1841
1842 free(config_path);
1843 }
1844
1845 static const char *get_super_prefix_or_empty(void)
1846 {
1847 const char *s = get_super_prefix();
1848 if (!s)
1849 s = "";
1850 return s;
1851 }
1852
1853 static int submodule_has_dirty_index(const struct submodule *sub)
1854 {
1855 struct child_process cp = CHILD_PROCESS_INIT;
1856
1857 prepare_submodule_repo_env(&cp.env_array);
1858
1859 cp.git_cmd = 1;
1860 strvec_pushl(&cp.args, "diff-index", "--quiet",
1861 "--cached", "HEAD", NULL);
1862 cp.no_stdin = 1;
1863 cp.no_stdout = 1;
1864 cp.dir = sub->path;
1865 if (start_command(&cp))
1866 die(_("could not recurse into submodule '%s'"), sub->path);
1867
1868 return finish_command(&cp);
1869 }
1870
1871 static void submodule_reset_index(const char *path)
1872 {
1873 struct child_process cp = CHILD_PROCESS_INIT;
1874 prepare_submodule_repo_env(&cp.env_array);
1875
1876 cp.git_cmd = 1;
1877 cp.no_stdin = 1;
1878 cp.dir = path;
1879
1880 strvec_pushf(&cp.args, "--super-prefix=%s%s/",
1881 get_super_prefix_or_empty(), path);
1882 strvec_pushl(&cp.args, "read-tree", "-u", "--reset", NULL);
1883
1884 strvec_push(&cp.args, empty_tree_oid_hex());
1885
1886 if (run_command(&cp))
1887 die(_("could not reset submodule index"));
1888 }
1889
1890 /**
1891 * Moves a submodule at a given path from a given head to another new head.
1892 * For edge cases (a submodule coming into existence or removing a submodule)
1893 * pass NULL for old or new respectively.
1894 */
1895 int submodule_move_head(const char *path,
1896 const char *old_head,
1897 const char *new_head,
1898 unsigned flags)
1899 {
1900 int ret = 0;
1901 struct child_process cp = CHILD_PROCESS_INIT;
1902 const struct submodule *sub;
1903 int *error_code_ptr, error_code;
1904
1905 if (!is_submodule_active(the_repository, path))
1906 return 0;
1907
1908 if (flags & SUBMODULE_MOVE_HEAD_FORCE)
1909 /*
1910 * Pass non NULL pointer to is_submodule_populated_gently
1911 * to prevent die()-ing. We'll use connect_work_tree_and_git_dir
1912 * to fixup the submodule in the force case later.
1913 */
1914 error_code_ptr = &error_code;
1915 else
1916 error_code_ptr = NULL;
1917
1918 if (old_head && !is_submodule_populated_gently(path, error_code_ptr))
1919 return 0;
1920
1921 sub = submodule_from_path(the_repository, null_oid(), path);
1922
1923 if (!sub)
1924 BUG("could not get submodule information for '%s'", path);
1925
1926 if (old_head && !(flags & SUBMODULE_MOVE_HEAD_FORCE)) {
1927 /* Check if the submodule has a dirty index. */
1928 if (submodule_has_dirty_index(sub))
1929 return error(_("submodule '%s' has dirty index"), path);
1930 }
1931
1932 if (!(flags & SUBMODULE_MOVE_HEAD_DRY_RUN)) {
1933 if (old_head) {
1934 if (!submodule_uses_gitfile(path))
1935 absorb_git_dir_into_superproject(path,
1936 ABSORB_GITDIR_RECURSE_SUBMODULES);
1937 } else {
1938 char *gitdir = xstrfmt("%s/modules/%s",
1939 get_git_dir(), sub->name);
1940 connect_work_tree_and_git_dir(path, gitdir, 0);
1941 free(gitdir);
1942
1943 /* make sure the index is clean as well */
1944 submodule_reset_index(path);
1945 }
1946
1947 if (old_head && (flags & SUBMODULE_MOVE_HEAD_FORCE)) {
1948 char *gitdir = xstrfmt("%s/modules/%s",
1949 get_git_dir(), sub->name);
1950 connect_work_tree_and_git_dir(path, gitdir, 1);
1951 free(gitdir);
1952 }
1953 }
1954
1955 prepare_submodule_repo_env(&cp.env_array);
1956
1957 cp.git_cmd = 1;
1958 cp.no_stdin = 1;
1959 cp.dir = path;
1960
1961 strvec_pushf(&cp.args, "--super-prefix=%s%s/",
1962 get_super_prefix_or_empty(), path);
1963 strvec_pushl(&cp.args, "read-tree", "--recurse-submodules", NULL);
1964
1965 if (flags & SUBMODULE_MOVE_HEAD_DRY_RUN)
1966 strvec_push(&cp.args, "-n");
1967 else
1968 strvec_push(&cp.args, "-u");
1969
1970 if (flags & SUBMODULE_MOVE_HEAD_FORCE)
1971 strvec_push(&cp.args, "--reset");
1972 else
1973 strvec_push(&cp.args, "-m");
1974
1975 if (!(flags & SUBMODULE_MOVE_HEAD_FORCE))
1976 strvec_push(&cp.args, old_head ? old_head : empty_tree_oid_hex());
1977
1978 strvec_push(&cp.args, new_head ? new_head : empty_tree_oid_hex());
1979
1980 if (run_command(&cp)) {
1981 ret = error(_("Submodule '%s' could not be updated."), path);
1982 goto out;
1983 }
1984
1985 if (!(flags & SUBMODULE_MOVE_HEAD_DRY_RUN)) {
1986 if (new_head) {
1987 child_process_init(&cp);
1988 /* also set the HEAD accordingly */
1989 cp.git_cmd = 1;
1990 cp.no_stdin = 1;
1991 cp.dir = path;
1992
1993 prepare_submodule_repo_env(&cp.env_array);
1994 strvec_pushl(&cp.args, "update-ref", "HEAD",
1995 "--no-deref", new_head, NULL);
1996
1997 if (run_command(&cp)) {
1998 ret = -1;
1999 goto out;
2000 }
2001 } else {
2002 struct strbuf sb = STRBUF_INIT;
2003
2004 strbuf_addf(&sb, "%s/.git", path);
2005 unlink_or_warn(sb.buf);
2006 strbuf_release(&sb);
2007
2008 if (is_empty_dir(path))
2009 rmdir_or_warn(path);
2010
2011 submodule_unset_core_worktree(sub);
2012 }
2013 }
2014 out:
2015 return ret;
2016 }
2017
2018 int validate_submodule_git_dir(char *git_dir, const char *submodule_name)
2019 {
2020 size_t len = strlen(git_dir), suffix_len = strlen(submodule_name);
2021 char *p;
2022 int ret = 0;
2023
2024 if (len <= suffix_len || (p = git_dir + len - suffix_len)[-1] != '/' ||
2025 strcmp(p, submodule_name))
2026 BUG("submodule name '%s' not a suffix of git dir '%s'",
2027 submodule_name, git_dir);
2028
2029 /*
2030 * We prevent the contents of sibling submodules' git directories to
2031 * clash.
2032 *
2033 * Example: having a submodule named `hippo` and another one named
2034 * `hippo/hooks` would result in the git directories
2035 * `.git/modules/hippo/` and `.git/modules/hippo/hooks/`, respectively,
2036 * but the latter directory is already designated to contain the hooks
2037 * of the former.
2038 */
2039 for (; *p; p++) {
2040 if (is_dir_sep(*p)) {
2041 char c = *p;
2042
2043 *p = '\0';
2044 if (is_git_directory(git_dir))
2045 ret = -1;
2046 *p = c;
2047
2048 if (ret < 0)
2049 return error(_("submodule git dir '%s' is "
2050 "inside git dir '%.*s'"),
2051 git_dir,
2052 (int)(p - git_dir), git_dir);
2053 }
2054 }
2055
2056 return 0;
2057 }
2058
2059 /*
2060 * Embeds a single submodules git directory into the superprojects git dir,
2061 * non recursively.
2062 */
2063 static void relocate_single_git_dir_into_superproject(const char *path)
2064 {
2065 char *old_git_dir = NULL, *real_old_git_dir = NULL, *real_new_git_dir = NULL;
2066 char *new_git_dir;
2067 const struct submodule *sub;
2068
2069 if (submodule_uses_worktrees(path))
2070 die(_("relocate_gitdir for submodule '%s' with "
2071 "more than one worktree not supported"), path);
2072
2073 old_git_dir = xstrfmt("%s/.git", path);
2074 if (read_gitfile(old_git_dir))
2075 /* If it is an actual gitfile, it doesn't need migration. */
2076 return;
2077
2078 real_old_git_dir = real_pathdup(old_git_dir, 1);
2079
2080 sub = submodule_from_path(the_repository, null_oid(), path);
2081 if (!sub)
2082 die(_("could not lookup name for submodule '%s'"), path);
2083
2084 new_git_dir = git_pathdup("modules/%s", sub->name);
2085 if (validate_submodule_git_dir(new_git_dir, sub->name) < 0)
2086 die(_("refusing to move '%s' into an existing git dir"),
2087 real_old_git_dir);
2088 if (safe_create_leading_directories_const(new_git_dir) < 0)
2089 die(_("could not create directory '%s'"), new_git_dir);
2090 real_new_git_dir = real_pathdup(new_git_dir, 1);
2091 free(new_git_dir);
2092
2093 fprintf(stderr, _("Migrating git directory of '%s%s' from\n'%s' to\n'%s'\n"),
2094 get_super_prefix_or_empty(), path,
2095 real_old_git_dir, real_new_git_dir);
2096
2097 relocate_gitdir(path, real_old_git_dir, real_new_git_dir);
2098
2099 free(old_git_dir);
2100 free(real_old_git_dir);
2101 free(real_new_git_dir);
2102 }
2103
2104 /*
2105 * Migrate the git directory of the submodule given by path from
2106 * having its git directory within the working tree to the git dir nested
2107 * in its superprojects git dir under modules/.
2108 */
2109 void absorb_git_dir_into_superproject(const char *path,
2110 unsigned flags)
2111 {
2112 int err_code;
2113 const char *sub_git_dir;
2114 struct strbuf gitdir = STRBUF_INIT;
2115 strbuf_addf(&gitdir, "%s/.git", path);
2116 sub_git_dir = resolve_gitdir_gently(gitdir.buf, &err_code);
2117
2118 /* Not populated? */
2119 if (!sub_git_dir) {
2120 const struct submodule *sub;
2121
2122 if (err_code == READ_GITFILE_ERR_STAT_FAILED) {
2123 /* unpopulated as expected */
2124 strbuf_release(&gitdir);
2125 return;
2126 }
2127
2128 if (err_code != READ_GITFILE_ERR_NOT_A_REPO)
2129 /* We don't know what broke here. */
2130 read_gitfile_error_die(err_code, path, NULL);
2131
2132 /*
2133 * Maybe populated, but no git directory was found?
2134 * This can happen if the superproject is a submodule
2135 * itself and was just absorbed. The absorption of the
2136 * superproject did not rewrite the git file links yet,
2137 * fix it now.
2138 */
2139 sub = submodule_from_path(the_repository, null_oid(), path);
2140 if (!sub)
2141 die(_("could not lookup name for submodule '%s'"), path);
2142 connect_work_tree_and_git_dir(path,
2143 git_path("modules/%s", sub->name), 0);
2144 } else {
2145 /* Is it already absorbed into the superprojects git dir? */
2146 char *real_sub_git_dir = real_pathdup(sub_git_dir, 1);
2147 char *real_common_git_dir = real_pathdup(get_git_common_dir(), 1);
2148
2149 if (!starts_with(real_sub_git_dir, real_common_git_dir))
2150 relocate_single_git_dir_into_superproject(path);
2151
2152 free(real_sub_git_dir);
2153 free(real_common_git_dir);
2154 }
2155 strbuf_release(&gitdir);
2156
2157 if (flags & ABSORB_GITDIR_RECURSE_SUBMODULES) {
2158 struct child_process cp = CHILD_PROCESS_INIT;
2159 struct strbuf sb = STRBUF_INIT;
2160
2161 if (flags & ~ABSORB_GITDIR_RECURSE_SUBMODULES)
2162 BUG("we don't know how to pass the flags down?");
2163
2164 strbuf_addstr(&sb, get_super_prefix_or_empty());
2165 strbuf_addstr(&sb, path);
2166 strbuf_addch(&sb, '/');
2167
2168 cp.dir = path;
2169 cp.git_cmd = 1;
2170 cp.no_stdin = 1;
2171 strvec_pushl(&cp.args, "--super-prefix", sb.buf,
2172 "submodule--helper",
2173 "absorb-git-dirs", NULL);
2174 prepare_submodule_repo_env(&cp.env_array);
2175 if (run_command(&cp))
2176 die(_("could not recurse into submodule '%s'"), path);
2177
2178 strbuf_release(&sb);
2179 }
2180 }
2181
2182 int get_superproject_working_tree(struct strbuf *buf)
2183 {
2184 struct child_process cp = CHILD_PROCESS_INIT;
2185 struct strbuf sb = STRBUF_INIT;
2186 struct strbuf one_up = STRBUF_INIT;
2187 const char *cwd = xgetcwd();
2188 int ret = 0;
2189 const char *subpath;
2190 int code;
2191 ssize_t len;
2192
2193 if (!is_inside_work_tree())
2194 /*
2195 * FIXME:
2196 * We might have a superproject, but it is harder
2197 * to determine.
2198 */
2199 return 0;
2200
2201 if (!strbuf_realpath(&one_up, "../", 0))
2202 return 0;
2203
2204 subpath = relative_path(cwd, one_up.buf, &sb);
2205 strbuf_release(&one_up);
2206
2207 prepare_submodule_repo_env(&cp.env_array);
2208 strvec_pop(&cp.env_array);
2209
2210 strvec_pushl(&cp.args, "--literal-pathspecs", "-C", "..",
2211 "ls-files", "-z", "--stage", "--full-name", "--",
2212 subpath, NULL);
2213 strbuf_reset(&sb);
2214
2215 cp.no_stdin = 1;
2216 cp.no_stderr = 1;
2217 cp.out = -1;
2218 cp.git_cmd = 1;
2219
2220 if (start_command(&cp))
2221 die(_("could not start ls-files in .."));
2222
2223 len = strbuf_read(&sb, cp.out, PATH_MAX);
2224 close(cp.out);
2225
2226 if (starts_with(sb.buf, "160000")) {
2227 int super_sub_len;
2228 int cwd_len = strlen(cwd);
2229 char *super_sub, *super_wt;
2230
2231 /*
2232 * There is a superproject having this repo as a submodule.
2233 * The format is <mode> SP <hash> SP <stage> TAB <full name> \0,
2234 * We're only interested in the name after the tab.
2235 */
2236 super_sub = strchr(sb.buf, '\t') + 1;
2237 super_sub_len = strlen(super_sub);
2238
2239 if (super_sub_len > cwd_len ||
2240 strcmp(&cwd[cwd_len - super_sub_len], super_sub))
2241 BUG("returned path string doesn't match cwd?");
2242
2243 super_wt = xstrdup(cwd);
2244 super_wt[cwd_len - super_sub_len] = '\0';
2245
2246 strbuf_realpath(buf, super_wt, 1);
2247 ret = 1;
2248 free(super_wt);
2249 }
2250 strbuf_release(&sb);
2251
2252 code = finish_command(&cp);
2253
2254 if (code == 128)
2255 /* '../' is not a git repository */
2256 return 0;
2257 if (code == 0 && len == 0)
2258 /* There is an unrelated git repository at '../' */
2259 return 0;
2260 if (code)
2261 die(_("ls-tree returned unexpected return code %d"), code);
2262
2263 return ret;
2264 }
2265
2266 /*
2267 * Put the gitdir for a submodule (given relative to the main
2268 * repository worktree) into `buf`, or return -1 on error.
2269 */
2270 int submodule_to_gitdir(struct strbuf *buf, const char *submodule)
2271 {
2272 const struct submodule *sub;
2273 const char *git_dir;
2274 int ret = 0;
2275
2276 strbuf_reset(buf);
2277 strbuf_addstr(buf, submodule);
2278 strbuf_complete(buf, '/');
2279 strbuf_addstr(buf, ".git");
2280
2281 git_dir = read_gitfile(buf->buf);
2282 if (git_dir) {
2283 strbuf_reset(buf);
2284 strbuf_addstr(buf, git_dir);
2285 }
2286 if (!is_git_directory(buf->buf)) {
2287 sub = submodule_from_path(the_repository, null_oid(),
2288 submodule);
2289 if (!sub) {
2290 ret = -1;
2291 goto cleanup;
2292 }
2293 strbuf_reset(buf);
2294 strbuf_git_path(buf, "%s/%s", "modules", sub->name);
2295 }
2296
2297 cleanup:
2298 return ret;
2299 }
git for Debian