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