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