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