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