blob: 78aed03d9282313e053bcfad7ffcde9418ad2616 [file] [log] [blame]
Brandon Williamse7241972017-12-12 11:53:52 -08001
Johannes Schindelin752c0c22009-10-19 14:38:32 +02002#include "cache.h"
Brandon Williams69aba532017-06-22 11:43:45 -07003#include "repository.h"
Brandon Williamsb2141fc2017-06-14 11:07:36 -07004#include "config.h"
Heiko Voigt851e18c2015-08-17 17:21:59 -07005#include "submodule-config.h"
Johannes Schindelin752c0c22009-10-19 14:38:32 +02006#include "submodule.h"
7#include "dir.h"
8#include "diff.h"
9#include "commit.h"
10#include "revision.h"
Jens Lehmannee6fc512010-01-16 18:42:24 +010011#include "run-command.h"
Jens Lehmannc7e1a732010-03-04 22:20:33 +010012#include "diffcore.h"
Heiko Voigt68d03e42010-07-07 15:39:13 +020013#include "refs.h"
Jens Lehmannaee9c7d2010-08-06 00:39:25 +020014#include "string-list.h"
Jeff Kingfe299ec2020-03-30 10:03:46 -040015#include "oid-array.h"
Jeff Kingdbbcd442020-07-28 16:23:39 -040016#include "strvec.h"
Jens Lehmann5fee9952013-07-30 21:50:34 +020017#include "blob.h"
Stefan Bellerfe85ee62015-12-15 16:04:11 -080018#include "thread-utils.h"
Jeff King46387282016-04-28 09:38:20 -040019#include "quote.h"
Brandon Williams06bf4ad2017-04-05 10:47:19 -070020#include "remote.h"
Stefan Bellerf6f85862016-12-12 11:04:35 -080021#include "worktree.h"
Stefan Beller046b4822017-05-31 17:30:47 -070022#include "parse-options.h"
Stefan Beller0d4a1322018-03-23 18:20:56 +010023#include "object-store.h"
Derrick Stolee64043552018-07-20 16:33:04 +000024#include "commit-reach.h"
Jens Lehmannaee9c7d2010-08-06 00:39:25 +020025
Stefan Bellerd7a38032017-05-26 12:10:12 -070026static int config_update_recurse_submodules = RECURSE_SUBMODULES_OFF;
Jeff King6859de42011-09-12 15:56:52 -040027static int initialized_fetch_ref_tips;
brian m. carlson910650d2017-03-31 01:40:00 +000028static struct oid_array ref_tips_before_fetch;
29static struct oid_array ref_tips_after_fetch;
Jeff King6859de42011-09-12 15:56:52 -040030
Jens Lehmannd4e98b52011-05-14 18:26:58 +020031/*
Brandon Williams34e2ba02017-08-02 12:49:21 -070032 * 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.
Jens Lehmannd4e98b52011-05-14 18:26:58 +020035 */
Derrick Stolee847a9e52021-04-01 01:49:39 +000036int is_gitmodules_unmerged(struct index_state *istate)
Brandon Williams34e2ba02017-08-02 12:49:21 -070037{
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}
Johannes Schindelin752c0c22009-10-19 14:38:32 +020051
Jens Lehmann5fee9952013-07-30 21:50:34 +020052/*
Antonio Ospiteb5c259f2018-10-05 15:05:59 +020053 * 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
70/*
Brandon Williams91b83482017-08-02 12:49:20 -070071 * 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.
Jens Lehmann5fee9952013-07-30 21:50:34 +020077 */
Brandon Williams7da9aba2017-12-12 11:53:51 -080078int is_staging_gitmodules_ok(struct index_state *istate)
Jens Lehmann5fee9952013-07-30 21:50:34 +020079{
Brandon Williams91b83482017-08-02 12:49:20 -070080 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 &&
David Turner7edee322020-01-27 13:58:56 -050085 ie_modified(istate, istate->cache[pos], &st, 0) & DATA_CHANGED)
Brandon Williams91b83482017-08-02 12:49:20 -070086 return 0;
87 }
88
89 return 1;
Jens Lehmann5fee9952013-07-30 21:50:34 +020090}
91
Nguyễn Thái Ngọc Duy2e2d4042017-08-23 19:36:57 +070092static 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
Jens Lehmann06567812013-08-06 21:15:11 +020099/*
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;
Heiko Voigt851e18c2015-08-17 17:21:59 -0700107 const struct submodule *submodule;
Antonio Ospite45f5ef32018-10-05 15:05:53 +0200108 int ret;
Jens Lehmann06567812013-08-06 21:15:11 +0200109
Brandon Williams4c0eeaf2017-08-02 12:49:16 -0700110 if (!file_exists(GITMODULES_FILE)) /* Do nothing without .gitmodules */
Jens Lehmann06567812013-08-06 21:15:11 +0200111 return -1;
112
Nguyễn Thái Ngọc Duy68f08b42018-08-13 18:14:31 +0200113 if (is_gitmodules_unmerged(the_repository->index))
Jens Lehmann06567812013-08-06 21:15:11 +0200114 die(_("Cannot change unmerged .gitmodules, resolve merge conflicts first"));
115
brian m. carlson14228442021-04-26 01:02:56 +0000116 submodule = submodule_from_path(the_repository, null_oid(), oldpath);
Heiko Voigt851e18c2015-08-17 17:21:59 -0700117 if (!submodule || !submodule->name) {
Jens Lehmann06567812013-08-06 21:15:11 +0200118 warning(_("Could not find section in .gitmodules where path=%s"), oldpath);
119 return -1;
120 }
121 strbuf_addstr(&entry, "submodule.");
Heiko Voigt851e18c2015-08-17 17:21:59 -0700122 strbuf_addstr(&entry, submodule->name);
Jens Lehmann06567812013-08-06 21:15:11 +0200123 strbuf_addstr(&entry, ".path");
Antonio Ospite45f5ef32018-10-05 15:05:53 +0200124 ret = config_set_in_gitmodules_file_gently(entry.buf, newpath);
Jens Lehmann06567812013-08-06 21:15:11 +0200125 strbuf_release(&entry);
Antonio Ospite45f5ef32018-10-05 15:05:53 +0200126 return ret;
Jens Lehmann06567812013-08-06 21:15:11 +0200127}
128
Jens Lehmann95c16412013-08-06 21:15:25 +0200129/*
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;
Heiko Voigt851e18c2015-08-17 17:21:59 -0700137 const struct submodule *submodule;
Jens Lehmann95c16412013-08-06 21:15:25 +0200138
Brandon Williams4c0eeaf2017-08-02 12:49:16 -0700139 if (!file_exists(GITMODULES_FILE)) /* Do nothing without .gitmodules */
Jens Lehmann95c16412013-08-06 21:15:25 +0200140 return -1;
141
Nguyễn Thái Ngọc Duy68f08b42018-08-13 18:14:31 +0200142 if (is_gitmodules_unmerged(the_repository->index))
Jens Lehmann95c16412013-08-06 21:15:25 +0200143 die(_("Cannot change unmerged .gitmodules, resolve merge conflicts first"));
144
brian m. carlson14228442021-04-26 01:02:56 +0000145 submodule = submodule_from_path(the_repository, null_oid(), path);
Heiko Voigt851e18c2015-08-17 17:21:59 -0700146 if (!submodule || !submodule->name) {
Jens Lehmann95c16412013-08-06 21:15:25 +0200147 warning(_("Could not find section in .gitmodules where path=%s"), path);
148 return -1;
149 }
150 strbuf_addstr(&sect, "submodule.");
Heiko Voigt851e18c2015-08-17 17:21:59 -0700151 strbuf_addstr(&sect, submodule->name);
Brandon Williams4c0eeaf2017-08-02 12:49:16 -0700152 if (git_config_rename_section_in_file(GITMODULES_FILE, sect.buf, NULL) < 0) {
Jens Lehmann95c16412013-08-06 21:15:25 +0200153 /* 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
Brandon Williams3b8317a2017-12-12 11:53:50 -0800162void stage_updated_gitmodules(struct index_state *istate)
Jens Lehmann5fee9952013-07-30 21:50:34 +0200163{
Brandon Williams3b8317a2017-12-12 11:53:50 -0800164 if (add_file_to_index(istate, GITMODULES_FILE, 0))
Jens Lehmann5fee9952013-07-30 21:50:34 +0200165 die(_("staging updated .gitmodules failed"));
166}
167
Jonathan Tana35e03d2021-08-16 14:09:51 -0700168static struct string_list added_submodule_odb_paths = STRING_LIST_INIT_NODUP;
169
Stefan Beller18cfc082018-05-15 13:00:28 -0700170/* TODO: remove this function, use repo_submodule_init instead. */
171int add_submodule_odb(const char *path)
Johannes Schindelin752c0c22009-10-19 14:38:32 +0200172{
173 struct strbuf objects_directory = STRBUF_INIT;
Jens Lehmannde7a7962010-01-31 17:43:49 +0100174 int ret = 0;
Johannes Schindelin752c0c22009-10-19 14:38:32 +0200175
Jacob Keller99b43a62016-08-31 16:27:22 -0700176 ret = strbuf_git_path_submodule(&objects_directory, path, "objects/");
177 if (ret)
178 goto done;
Jens Lehmannde7a7962010-01-31 17:43:49 +0100179 if (!is_directory(objects_directory.buf)) {
180 ret = -1;
181 goto done;
182 }
Jonathan Tana35e03d2021-08-16 14:09:51 -0700183 string_list_insert(&added_submodule_odb_paths,
184 strbuf_detach(&objects_directory, NULL));
Jens Lehmannde7a7962010-01-31 17:43:49 +0100185done:
186 strbuf_release(&objects_directory);
187 return ret;
Johannes Schindelin752c0c22009-10-19 14:38:32 +0200188}
189
Jonathan Tan8d33c3a2021-08-16 14:09:52 -0700190void add_submodule_odb_by_path(const char *path)
191{
192 string_list_insert(&added_submodule_odb_paths, xstrdup(path));
193}
194
Jonathan Tana35e03d2021-08-16 14:09:51 -0700195int 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
Jens Lehmannaee9c7d2010-08-06 00:39:25 +0200210void set_diffopt_flags_from_submodule_config(struct diff_options *diffopt,
211 const char *path)
212{
Stefan Beller3b8fb392018-03-28 15:35:29 -0700213 const struct submodule *submodule = submodule_from_path(the_repository,
brian m. carlson14228442021-04-26 01:02:56 +0000214 null_oid(),
215 path);
Heiko Voigt851e18c2015-08-17 17:21:59 -0700216 if (submodule) {
Brandon Williamsfdfa9e92017-08-03 11:19:52 -0700217 const char *ignore;
218 char *key;
219
220 key = xstrfmt("submodule.%s.ignore", submodule->name);
Jeff Kingf1de9812020-08-14 12:17:36 -0400221 if (repo_config_get_string_tmp(the_repository, key, &ignore))
Brandon Williamsfdfa9e92017-08-03 11:19:52 -0700222 ignore = submodule->ignore;
223 free(key);
224
225 if (ignore)
226 handle_ignore_submodules_arg(diffopt, ignore);
Nguyễn Thái Ngọc Duy68f08b42018-08-13 18:14:31 +0200227 else if (is_gitmodules_unmerged(the_repository->index))
Brandon Williams0d1e0e72017-10-31 11:19:11 -0700228 diffopt->flags.ignore_submodules = 1;
Jens Lehmannaee9c7d2010-08-06 00:39:25 +0200229 }
230}
231
Stefan Beller046b4822017-05-31 17:30:47 -0700232/* 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;
Stefan Beller1d789d02017-05-26 12:10:13 -0700241}
242
Stefan Bellerd7a38032017-05-26 12:10:12 -0700243int 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
Brandon Williams5688c282016-12-16 11:03:16 -0800260/*
Brandon Williamsf9f42562016-12-16 11:03:17 -0800261 * Determine if a submodule has been initialized at a given 'path'
262 */
Atharva Raykara4521282021-08-06 19:34:31 +0530263/*
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 */
Brandon Williams627d9342017-06-22 11:43:46 -0700268int is_submodule_active(struct repository *repo, const char *path)
Brandon Williamsf9f42562016-12-16 11:03:17 -0800269{
270 int ret = 0;
Brandon Williamsa086f922017-03-17 15:38:01 -0700271 char *key = NULL;
272 char *value = NULL;
273 const struct string_list *sl;
Brandon Williams627d9342017-06-22 11:43:46 -0700274 const struct submodule *module;
275
brian m. carlson14228442021-04-26 01:02:56 +0000276 module = submodule_from_path(repo, null_oid(), path);
Brandon Williamsf9f42562016-12-16 11:03:17 -0800277
Brandon Williamsa086f922017-03-17 15:38:01 -0700278 /* early return if there isn't a path->module mapping */
279 if (!module)
280 return 0;
Brandon Williamsf9f42562016-12-16 11:03:17 -0800281
Brandon Williamsa086f922017-03-17 15:38:01 -0700282 /* submodule.<name>.active is set */
283 key = xstrfmt("submodule.%s.active", module->name);
Brandon Williams627d9342017-06-22 11:43:46 -0700284 if (!repo_config_get_bool(repo, key, &ret)) {
Brandon Williamsf9f42562016-12-16 11:03:17 -0800285 free(key);
Brandon Williamsa086f922017-03-17 15:38:01 -0700286 return ret;
287 }
288 free(key);
289
290 /* submodule.active is set */
Brandon Williams627d9342017-06-22 11:43:46 -0700291 sl = repo_config_get_value_multi(repo, "submodule.active");
Brandon Williamsa086f922017-03-17 15:38:01 -0700292 if (sl) {
293 struct pathspec ps;
Jeff Kingc972bf42020-07-28 16:25:12 -0400294 struct strvec args = STRVEC_INIT;
Brandon Williamsa086f922017-03-17 15:38:01 -0700295 const struct string_list_item *item;
296
297 for_each_string_list_item(item, sl) {
Jeff Kingc972bf42020-07-28 16:25:12 -0400298 strvec_push(&args, item->string);
Brandon Williamsa086f922017-03-17 15:38:01 -0700299 }
300
Jeff Kingd70a9eb2020-07-28 20:37:20 -0400301 parse_pathspec(&ps, 0, 0, NULL, args.v);
Nguyễn Thái Ngọc Duy68f08b42018-08-13 18:14:31 +0200302 ret = match_pathspec(repo->index, &ps, path, strlen(path), 0, NULL, 1);
Brandon Williamsa086f922017-03-17 15:38:01 -0700303
Jeff Kingc972bf42020-07-28 16:25:12 -0400304 strvec_clear(&args);
Brandon Williamsa086f922017-03-17 15:38:01 -0700305 clear_pathspec(&ps);
306 return ret;
Brandon Williamsf9f42562016-12-16 11:03:17 -0800307 }
308
Brandon Williamsa086f922017-03-17 15:38:01 -0700309 /* fallback to checking if the URL is set */
310 key = xstrfmt("submodule.%s.url", module->name);
Brandon Williams627d9342017-06-22 11:43:46 -0700311 ret = !repo_config_get_string(repo, key, &value);
Brandon Williamsa086f922017-03-17 15:38:01 -0700312
313 free(value);
314 free(key);
Brandon Williamsf9f42562016-12-16 11:03:17 -0800315 return ret;
316}
317
Stefan Beller15cdc642017-03-14 14:46:31 -0700318int is_submodule_populated_gently(const char *path, int *return_error_code)
Brandon Williams5688c282016-12-16 11:03:16 -0800319{
320 int ret = 0;
321 char *gitdir = xstrfmt("%s/.git", path);
322
Stefan Beller15cdc642017-03-14 14:46:31 -0700323 if (resolve_gitdir_gently(gitdir, return_error_code))
Brandon Williams5688c282016-12-16 11:03:16 -0800324 ret = 1;
325
326 free(gitdir);
327 return ret;
328}
329
Brandon Williamsbdab9722017-05-09 12:17:59 -0700330/*
331 * Dies if the provided 'prefix' corresponds to an unpopulated submodule
332 */
Derrick Stolee847a9e52021-04-01 01:49:39 +0000333void die_in_unpopulated_submodule(struct index_state *istate,
Brandon Williamsbdab9722017-05-09 12:17:59 -0700334 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
Brandon Williamsc08397e2017-05-11 15:04:24 -0700360/*
361 * Dies if any paths in the provided pathspec descends into a submodule
362 */
Derrick Stolee847a9e52021-04-01 01:49:39 +0000363void die_path_inside_submodule(struct index_state *istate,
Brandon Williamsc08397e2017-05-11 15:04:24 -0700364 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
Brandon Williamsec6141a2017-08-03 11:19:50 -0700393enum submodule_update_type parse_submodule_update_type(const char *value)
394{
395 if (!strcmp(value, "none"))
396 return SM_UPDATE_NONE;
397 else if (!strcmp(value, "checkout"))
398 return SM_UPDATE_CHECKOUT;
399 else if (!strcmp(value, "rebase"))
400 return SM_UPDATE_REBASE;
401 else if (!strcmp(value, "merge"))
402 return SM_UPDATE_MERGE;
403 else if (*value == '!')
404 return SM_UPDATE_COMMAND;
405 else
406 return SM_UPDATE_UNSPECIFIED;
407}
408
Stefan Bellerea2fa5a2016-02-29 18:07:11 -0800409int parse_submodule_update_strategy(const char *value,
410 struct submodule_update_strategy *dst)
411{
Brandon Williamsec6141a2017-08-03 11:19:50 -0700412 enum submodule_update_type type;
413
Stefan Bellerea2fa5a2016-02-29 18:07:11 -0800414 free((void*)dst->command);
415 dst->command = NULL;
Brandon Williamsec6141a2017-08-03 11:19:50 -0700416
417 type = parse_submodule_update_type(value);
418 if (type == SM_UPDATE_UNSPECIFIED)
Stefan Bellerea2fa5a2016-02-29 18:07:11 -0800419 return -1;
Brandon Williamsec6141a2017-08-03 11:19:50 -0700420
421 dst->type = type;
422 if (type == SM_UPDATE_COMMAND)
423 dst->command = xstrdup(value + 1);
424
Stefan Bellerea2fa5a2016-02-29 18:07:11 -0800425 return 0;
426}
427
Stefan Beller36042422016-04-15 17:50:13 -0700428const 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
Jens Lehmann46a958b2010-06-25 16:56:47 +0200449void handle_ignore_submodules_arg(struct diff_options *diffopt,
450 const char *arg)
451{
Sangeeta Jain8ef93122020-11-10 14:09:00 +0530452 diffopt->flags.ignore_submodule_set = 1;
Brandon Williams0d1e0e72017-10-31 11:19:11 -0700453 diffopt->flags.ignore_submodules = 0;
454 diffopt->flags.ignore_untracked_in_submodules = 0;
455 diffopt->flags.ignore_dirty_submodules = 0;
Johannes Schindelinbe4f2b42010-08-05 10:49:55 +0200456
Jens Lehmann46a958b2010-06-25 16:56:47 +0200457 if (!strcmp(arg, "all"))
Brandon Williams0d1e0e72017-10-31 11:19:11 -0700458 diffopt->flags.ignore_submodules = 1;
Jens Lehmann46a958b2010-06-25 16:56:47 +0200459 else if (!strcmp(arg, "untracked"))
Brandon Williams0d1e0e72017-10-31 11:19:11 -0700460 diffopt->flags.ignore_untracked_in_submodules = 1;
Jens Lehmann46a958b2010-06-25 16:56:47 +0200461 else if (!strcmp(arg, "dirty"))
Brandon Williams0d1e0e72017-10-31 11:19:11 -0700462 diffopt->flags.ignore_dirty_submodules = 1;
Jens Lehmannaee9c7d2010-08-06 00:39:25 +0200463 else if (strcmp(arg, "none"))
Ralf Thielowa4ffbbb2020-01-15 19:07:01 +0100464 die(_("bad --ignore-submodules argument: %s"), arg);
Nguyễn Thái Ngọc Duy5a59a232019-02-16 18:24:41 +0700465 /*
466 * Please update _git_status() in git-completion.bash when you
467 * add new options
468 */
Jens Lehmann46a958b2010-06-25 16:56:47 +0200469}
470
Junio C Hamano4831c232020-09-18 17:58:05 -0700471static 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)
Jonathan Nieder808a95d2011-03-16 02:14:11 -0500475{
Jacob Keller8e6df652016-08-31 16:27:24 -0700476 struct commit_list *list;
Jonathan Nieder808a95d2011-03-16 02:14:11 -0500477
Michael Forney85a1ec22020-06-23 13:56:59 -0700478 repo_init_revisions(r, rev, NULL);
Jonathan Nieder808a95d2011-03-16 02:14:11 -0500479 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);
Jonathan Nieder808a95d2011-03-16 02:14:11 -0500485 for (list = merge_bases; list; list = list->next) {
486 list->item->object.flags |= UNINTERESTING;
487 add_pending_object(rev, &list->item->object,
brian m. carlsonf2fd0762015-11-10 02:22:28 +0000488 oid_to_hex(&list->item->object.oid));
Jonathan Nieder808a95d2011-03-16 02:14:11 -0500489 }
490 return prepare_revision_walk(rev);
491}
492
Shourya Shukla180b1542020-08-13 01:14:02 +0530493static void print_submodule_diff_summary(struct repository *r, struct rev_info *rev, struct diff_options *o)
Jonathan Nieder808a95d2011-03-16 02:14:11 -0500494{
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;
Alexey Shumkinecaee802013-06-26 14:19:50 +0400502 ctx.output_encoding = get_log_output_encoding();
Jonathan Nieder808a95d2011-03-16 02:14:11 -0500503 strbuf_setlen(&sb, 0);
Stefan Beller605f0ec2018-12-14 16:09:37 -0800504 repo_format_commit_message(r, commit, format, &sb,
505 &ctx);
Jonathan Nieder808a95d2011-03-16 02:14:11 -0500506 strbuf_addch(&sb, '\n');
Stefan Bellerf3597132017-06-29 17:07:00 -0700507 if (commit->object.flags & SYMMETRIC_LEFT)
508 diff_emit_submodule_del(o, sb.buf);
509 else
510 diff_emit_submodule_add(o, sb.buf);
Jonathan Nieder808a95d2011-03-16 02:14:11 -0500511 }
512 strbuf_release(&sb);
513}
514
Jeff Kingc972bf42020-07-28 16:25:12 -0400515void prepare_submodule_repo_env(struct strvec *out)
Stefan Beller6cd57572017-03-14 14:46:35 -0700516{
Jonathan Tand1fa9432021-06-17 10:13:25 -0700517 prepare_other_repo_env(out, DEFAULT_GIT_DIR_ENVIRONMENT);
Stefan Beller6cd57572017-03-14 14:46:35 -0700518}
519
Jeff Kingc972bf42020-07-28 16:25:12 -0400520static void prepare_submodule_repo_env_in_gitdir(struct strvec *out)
Stefan Bellera62387b2018-11-28 16:27:55 -0800521{
Jonathan Tand1fa9432021-06-17 10:13:25 -0700522 prepare_other_repo_env(out, ".");
Stefan Bellera62387b2018-11-28 16:27:55 -0800523}
524
Stefan Beller605f0ec2018-12-14 16:09:37 -0800525/*
526 * Initialize a repository struct for a submodule based on the provided 'path'.
527 *
528 * Unlike repo_submodule_init, this tolerates submodules not present
529 * in .gitmodules. This function exists only to preserve historical behavior,
530 *
531 * Returns the repository struct on success,
532 * NULL when the submodule is not present.
Jacob Keller8e6df652016-08-31 16:27:24 -0700533 */
Stefan Beller605f0ec2018-12-14 16:09:37 -0800534static struct repository *open_submodule(const char *path)
535{
536 struct strbuf sb = STRBUF_INIT;
537 struct repository *out = xmalloc(sizeof(*out));
538
539 if (submodule_to_gitdir(&sb, path) || repo_init(out, sb.buf, NULL)) {
540 strbuf_release(&sb);
541 free(out);
542 return NULL;
543 }
544
545 /* Mark it as a submodule */
546 out->submodule_prefix = xstrdup(path);
547
548 strbuf_release(&sb);
549 return out;
550}
551
552/*
553 * Helper function to display the submodule header line prior to the full
554 * summary output.
555 *
556 * If it can locate the submodule git directory it will create a repository
557 * handle for the submodule and lookup both the left and right commits and
558 * put them into the left and right pointers.
559 */
560static void show_submodule_header(struct diff_options *o,
561 const char *path,
Jacob Keller602a2832016-08-31 16:27:23 -0700562 struct object_id *one, struct object_id *two,
Stefan Bellerf3597132017-06-29 17:07:00 -0700563 unsigned dirty_submodule,
Stefan Beller605f0ec2018-12-14 16:09:37 -0800564 struct repository *sub,
Jacob Keller8e6df652016-08-31 16:27:24 -0700565 struct commit **left, struct commit **right,
566 struct commit_list **merge_bases)
Johannes Schindelin752c0c22009-10-19 14:38:32 +0200567{
Johannes Schindelin752c0c22009-10-19 14:38:32 +0200568 const char *message = NULL;
569 struct strbuf sb = STRBUF_INIT;
Johannes Schindelin752c0c22009-10-19 14:38:32 +0200570 int fast_forward = 0, fast_backward = 0;
571
Jens Lehmannc7e1a732010-03-04 22:20:33 +0100572 if (dirty_submodule & DIRTY_SUBMODULE_UNTRACKED)
Stefan Bellerf3597132017-06-29 17:07:00 -0700573 diff_emit_submodule_untracked(o, path);
574
Jens Lehmannc7e1a732010-03-04 22:20:33 +0100575 if (dirty_submodule & DIRTY_SUBMODULE_MODIFIED)
Stefan Bellerf3597132017-06-29 17:07:00 -0700576 diff_emit_submodule_modified(o, path);
Jens Lehmannc7e1a732010-03-04 22:20:33 +0100577
Jacob Keller8e6df652016-08-31 16:27:24 -0700578 if (is_null_oid(one))
579 message = "(new submodule)";
580 else if (is_null_oid(two))
581 message = "(submodule deleted)";
582
Stefan Beller605f0ec2018-12-14 16:09:37 -0800583 if (!sub) {
Jacob Keller8e6df652016-08-31 16:27:24 -0700584 if (!message)
Stefan Beller2d94dd22017-09-26 11:27:56 -0700585 message = "(commits not present)";
Jacob Keller8e6df652016-08-31 16:27:24 -0700586 goto output_header;
587 }
588
589 /*
590 * Attempt to lookup the commit references, and determine if this is
591 * a fast forward or fast backwards update.
592 */
Stefan Beller605f0ec2018-12-14 16:09:37 -0800593 *left = lookup_commit_reference(sub, one);
594 *right = lookup_commit_reference(sub, two);
Jacob Keller8e6df652016-08-31 16:27:24 -0700595
596 /*
597 * Warn about missing commits in the submodule project, but only if
598 * they aren't null.
599 */
600 if ((!is_null_oid(one) && !*left) ||
601 (!is_null_oid(two) && !*right))
602 message = "(commits not present)";
603
Stefan Beller605f0ec2018-12-14 16:09:37 -0800604 *merge_bases = repo_get_merge_bases(sub, *left, *right);
Jacob Keller8e6df652016-08-31 16:27:24 -0700605 if (*merge_bases) {
606 if ((*merge_bases)->item == *left)
607 fast_forward = 1;
608 else if ((*merge_bases)->item == *right)
609 fast_backward = 1;
610 }
611
Jeff King4a7e27e2018-08-28 17:22:40 -0400612 if (oideq(one, two)) {
Jens Lehmannc7e1a732010-03-04 22:20:33 +0100613 strbuf_release(&sb);
614 return;
615 }
616
Jacob Keller8e6df652016-08-31 16:27:24 -0700617output_header:
Stefan Bellerf3597132017-06-29 17:07:00 -0700618 strbuf_addf(&sb, "Submodule %s ", path);
brian m. carlson30e677e2018-03-12 02:27:28 +0000619 strbuf_add_unique_abbrev(&sb, one, DEFAULT_ABBREV);
René Scharfea94bb682016-10-08 17:38:47 +0200620 strbuf_addstr(&sb, (fast_backward || fast_forward) ? ".." : "...");
brian m. carlson30e677e2018-03-12 02:27:28 +0000621 strbuf_add_unique_abbrev(&sb, two, DEFAULT_ABBREV);
Johannes Schindelin752c0c22009-10-19 14:38:32 +0200622 if (message)
Stefan Bellerf3597132017-06-29 17:07:00 -0700623 strbuf_addf(&sb, " %s\n", message);
Johannes Schindelin752c0c22009-10-19 14:38:32 +0200624 else
Stefan Bellerf3597132017-06-29 17:07:00 -0700625 strbuf_addf(&sb, "%s:\n", fast_backward ? " (rewind)" : "");
626 diff_emit_submodule_header(o, sb.buf);
Johannes Schindelin752c0c22009-10-19 14:38:32 +0200627
Johannes Schindelin752c0c22009-10-19 14:38:32 +0200628 strbuf_release(&sb);
629}
Jens Lehmannee6fc512010-01-16 18:42:24 +0100630
Shourya Shukla180b1542020-08-13 01:14:02 +0530631void show_submodule_diff_summary(struct diff_options *o, const char *path,
Jacob Keller8e6df652016-08-31 16:27:24 -0700632 struct object_id *one, struct object_id *two,
Stefan Bellerf3597132017-06-29 17:07:00 -0700633 unsigned dirty_submodule)
Jacob Keller8e6df652016-08-31 16:27:24 -0700634{
635 struct rev_info rev;
636 struct commit *left = NULL, *right = NULL;
637 struct commit_list *merge_bases = NULL;
Stefan Beller605f0ec2018-12-14 16:09:37 -0800638 struct repository *sub;
Jacob Keller8e6df652016-08-31 16:27:24 -0700639
Stefan Beller605f0ec2018-12-14 16:09:37 -0800640 sub = open_submodule(path);
Stefan Bellerf3597132017-06-29 17:07:00 -0700641 show_submodule_header(o, path, one, two, dirty_submodule,
Stefan Beller605f0ec2018-12-14 16:09:37 -0800642 sub, &left, &right, &merge_bases);
Jacob Keller8e6df652016-08-31 16:27:24 -0700643
644 /*
645 * If we don't have both a left and a right pointer, there is no
646 * reason to try and display a summary. The header line should contain
647 * all the information the user needs.
648 */
Stefan Beller605f0ec2018-12-14 16:09:37 -0800649 if (!left || !right || !sub)
Jacob Keller8e6df652016-08-31 16:27:24 -0700650 goto out;
651
652 /* Treat revision walker failure the same as missing commits */
Junio C Hamano4831c232020-09-18 17:58:05 -0700653 if (prepare_submodule_diff_summary(sub, &rev, path, left, right, merge_bases)) {
Stefan Bellerf3597132017-06-29 17:07:00 -0700654 diff_emit_submodule_error(o, "(revision walker failed)\n");
Jacob Keller8e6df652016-08-31 16:27:24 -0700655 goto out;
656 }
657
Shourya Shukla180b1542020-08-13 01:14:02 +0530658 print_submodule_diff_summary(sub, &rev, o);
Jacob Keller8e6df652016-08-31 16:27:24 -0700659
660out:
661 if (merge_bases)
662 free_commit_list(merge_bases);
663 clear_commit_marks(left, ~0);
664 clear_commit_marks(right, ~0);
Stefan Beller605f0ec2018-12-14 16:09:37 -0800665 if (sub) {
666 repo_clear(sub);
667 free(sub);
668 }
Jacob Keller8e6df652016-08-31 16:27:24 -0700669}
670
Stefan Bellerf3597132017-06-29 17:07:00 -0700671void show_submodule_inline_diff(struct diff_options *o, const char *path,
Jacob Kellerfd47ae62016-08-31 16:27:25 -0700672 struct object_id *one, struct object_id *two,
Stefan Bellerf3597132017-06-29 17:07:00 -0700673 unsigned dirty_submodule)
Jacob Kellerfd47ae62016-08-31 16:27:25 -0700674{
Brandon Williamsbc099912018-02-14 10:59:49 -0800675 const struct object_id *old_oid = the_hash_algo->empty_tree, *new_oid = the_hash_algo->empty_tree;
Jacob Kellerfd47ae62016-08-31 16:27:25 -0700676 struct commit *left = NULL, *right = NULL;
677 struct commit_list *merge_bases = NULL;
Jacob Kellerfd47ae62016-08-31 16:27:25 -0700678 struct child_process cp = CHILD_PROCESS_INIT;
Stefan Bellerf3597132017-06-29 17:07:00 -0700679 struct strbuf sb = STRBUF_INIT;
Stefan Beller605f0ec2018-12-14 16:09:37 -0800680 struct repository *sub;
Jacob Kellerfd47ae62016-08-31 16:27:25 -0700681
Stefan Beller605f0ec2018-12-14 16:09:37 -0800682 sub = open_submodule(path);
Stefan Bellerf3597132017-06-29 17:07:00 -0700683 show_submodule_header(o, path, one, two, dirty_submodule,
Stefan Beller605f0ec2018-12-14 16:09:37 -0800684 sub, &left, &right, &merge_bases);
Jacob Kellerfd47ae62016-08-31 16:27:25 -0700685
686 /* We need a valid left and right commit to display a difference */
687 if (!(left || is_null_oid(one)) ||
688 !(right || is_null_oid(two)))
689 goto done;
690
691 if (left)
Brandon Williamsbc099912018-02-14 10:59:49 -0800692 old_oid = one;
Jacob Kellerfd47ae62016-08-31 16:27:25 -0700693 if (right)
Brandon Williamsbc099912018-02-14 10:59:49 -0800694 new_oid = two;
Jacob Kellerfd47ae62016-08-31 16:27:25 -0700695
Jacob Kellerfd47ae62016-08-31 16:27:25 -0700696 cp.git_cmd = 1;
697 cp.dir = path;
Stefan Bellerf3597132017-06-29 17:07:00 -0700698 cp.out = -1;
Jacob Kellerfd47ae62016-08-31 16:27:25 -0700699 cp.no_stdin = 1;
700
701 /* TODO: other options may need to be passed here. */
Jeff Kingc972bf42020-07-28 16:25:12 -0400702 strvec_pushl(&cp.args, "diff", "--submodule=diff", NULL);
703 strvec_pushf(&cp.args, "--color=%s", want_color(o->use_color) ?
Stefan Bellerf3597132017-06-29 17:07:00 -0700704 "always" : "never");
Stefan Beller5a522142017-05-04 14:43:55 -0700705
Brandon Williams0d1e0e72017-10-31 11:19:11 -0700706 if (o->flags.reverse_diff) {
Jeff Kingc972bf42020-07-28 16:25:12 -0400707 strvec_pushf(&cp.args, "--src-prefix=%s%s/",
Jeff Kingf6d89422020-07-28 16:26:31 -0400708 o->b_prefix, path);
Jeff Kingc972bf42020-07-28 16:25:12 -0400709 strvec_pushf(&cp.args, "--dst-prefix=%s%s/",
Jeff Kingf6d89422020-07-28 16:26:31 -0400710 o->a_prefix, path);
Jacob Kellerfd47ae62016-08-31 16:27:25 -0700711 } else {
Jeff Kingc972bf42020-07-28 16:25:12 -0400712 strvec_pushf(&cp.args, "--src-prefix=%s%s/",
Jeff Kingf6d89422020-07-28 16:26:31 -0400713 o->a_prefix, path);
Jeff Kingc972bf42020-07-28 16:25:12 -0400714 strvec_pushf(&cp.args, "--dst-prefix=%s%s/",
Jeff Kingf6d89422020-07-28 16:26:31 -0400715 o->b_prefix, path);
Jacob Kellerfd47ae62016-08-31 16:27:25 -0700716 }
Jeff Kingc972bf42020-07-28 16:25:12 -0400717 strvec_push(&cp.args, oid_to_hex(old_oid));
Jacob Kellerfd47ae62016-08-31 16:27:25 -0700718 /*
719 * If the submodule has modified content, we will diff against the
720 * work tree, under the assumption that the user has asked for the
721 * diff format and wishes to actually see all differences even if they
722 * haven't yet been committed to the submodule yet.
723 */
724 if (!(dirty_submodule & DIRTY_SUBMODULE_MODIFIED))
Jeff Kingc972bf42020-07-28 16:25:12 -0400725 strvec_push(&cp.args, oid_to_hex(new_oid));
Jacob Kellerfd47ae62016-08-31 16:27:25 -0700726
Stefan Beller17b254c2017-03-31 16:17:32 -0700727 prepare_submodule_repo_env(&cp.env_array);
David Turnerf1c03682021-08-31 09:12:56 -0400728
729 if (!is_directory(path)) {
730 /* fall back to absorbed git dir, if any */
731 if (!sub)
732 goto done;
733 cp.dir = sub->gitdir;
734 strvec_push(&cp.env_array, GIT_DIR_ENVIRONMENT "=.");
735 strvec_push(&cp.env_array, GIT_WORK_TREE_ENVIRONMENT "=.");
736 }
737
David Turner67f61ef2021-08-31 09:12:57 -0400738 if (start_command(&cp)) {
Stefan Bellerf3597132017-06-29 17:07:00 -0700739 diff_emit_submodule_error(o, "(diff failed)\n");
David Turner67f61ef2021-08-31 09:12:57 -0400740 goto done;
741 }
Stefan Bellerf3597132017-06-29 17:07:00 -0700742
743 while (strbuf_getwholeline_fd(&sb, cp.out, '\n') != EOF)
744 diff_emit_submodule_pipethrough(o, sb.buf, sb.len);
745
746 if (finish_command(&cp))
747 diff_emit_submodule_error(o, "(diff failed)\n");
Jacob Kellerfd47ae62016-08-31 16:27:25 -0700748
749done:
Stefan Bellerf3597132017-06-29 17:07:00 -0700750 strbuf_release(&sb);
Jacob Kellerfd47ae62016-08-31 16:27:25 -0700751 if (merge_bases)
752 free_commit_list(merge_bases);
753 if (left)
754 clear_commit_marks(left, ~0);
755 if (right)
756 clear_commit_marks(right, ~0);
Stefan Beller605f0ec2018-12-14 16:09:37 -0800757 if (sub) {
758 repo_clear(sub);
759 free(sub);
760 }
Jacob Kellerfd47ae62016-08-31 16:27:25 -0700761}
762
Stefan Beller84f89252017-03-14 14:46:34 -0700763int should_update_submodules(void)
764{
765 return config_update_recurse_submodules == RECURSE_SUBMODULES_ON;
766}
767
768const struct submodule *submodule_from_ce(const struct cache_entry *ce)
769{
770 if (!S_ISGITLINK(ce->ce_mode))
771 return NULL;
772
773 if (!should_update_submodules())
774 return NULL;
775
brian m. carlson14228442021-04-26 01:02:56 +0000776 return submodule_from_path(the_repository, null_oid(), ce->name);
Stefan Beller84f89252017-03-14 14:46:34 -0700777}
778
Brandon Williamsaacc5c12017-05-01 18:02:39 -0700779static struct oid_array *submodule_commits(struct string_list *submodules,
Heiko Voigtc68f8372017-10-16 15:58:27 +0200780 const char *name)
Brandon Williamsaacc5c12017-05-01 18:02:39 -0700781{
782 struct string_list_item *item;
783
Heiko Voigtc68f8372017-10-16 15:58:27 +0200784 item = string_list_insert(submodules, name);
Brandon Williamsaacc5c12017-05-01 18:02:39 -0700785 if (item->util)
786 return (struct oid_array *) item->util;
787
788 /* NEEDSWORK: should we have oid_array_init()? */
789 item->util = xcalloc(1, sizeof(struct oid_array));
790 return (struct oid_array *) item->util;
791}
792
Heiko Voigtc68f8372017-10-16 15:58:27 +0200793struct collect_changed_submodules_cb_data {
Nguyễn Thái Ngọc Duy6245b982018-10-19 19:34:43 +0200794 struct repository *repo;
Heiko Voigtc68f8372017-10-16 15:58:27 +0200795 struct string_list *changed;
796 const struct object_id *commit_oid;
797};
798
799/*
800 * this would normally be two functions: default_name_from_path() and
801 * path_from_default_name(). Since the default name is the same as
802 * the submodule path we can get away with just one function which only
803 * checks whether there is a submodule in the working directory at that
804 * location.
805 */
806static const char *default_name_or_path(const char *path_or_name)
807{
808 int error_code;
809
810 if (!is_submodule_populated_gently(path_or_name, &error_code))
811 return NULL;
812
813 return path_or_name;
814}
815
Brandon Williamsaacc5c12017-05-01 18:02:39 -0700816static void collect_changed_submodules_cb(struct diff_queue_struct *q,
817 struct diff_options *options,
818 void *data)
819{
Heiko Voigtc68f8372017-10-16 15:58:27 +0200820 struct collect_changed_submodules_cb_data *me = data;
821 struct string_list *changed = me->changed;
822 const struct object_id *commit_oid = me->commit_oid;
Brandon Williamsaacc5c12017-05-01 18:02:39 -0700823 int i;
Brandon Williamsaacc5c12017-05-01 18:02:39 -0700824
825 for (i = 0; i < q->nr; i++) {
826 struct diff_filepair *p = q->queue[i];
827 struct oid_array *commits;
Heiko Voigtc68f8372017-10-16 15:58:27 +0200828 const struct submodule *submodule;
829 const char *name;
830
Brandon Williamsaacc5c12017-05-01 18:02:39 -0700831 if (!S_ISGITLINK(p->two->mode))
832 continue;
833
Nguyễn Thái Ngọc Duy6245b982018-10-19 19:34:43 +0200834 submodule = submodule_from_path(me->repo,
Stefan Beller3b8fb392018-03-28 15:35:29 -0700835 commit_oid, p->two->path);
Heiko Voigtc68f8372017-10-16 15:58:27 +0200836 if (submodule)
837 name = submodule->name;
838 else {
839 name = default_name_or_path(p->two->path);
840 /* make sure name does not collide with existing one */
Stefan Beller5fc84752018-06-14 10:31:07 -0700841 if (name)
Nguyễn Thái Ngọc Duy6245b982018-10-19 19:34:43 +0200842 submodule = submodule_from_name(me->repo,
Stefan Beller5fc84752018-06-14 10:31:07 -0700843 commit_oid, name);
Heiko Voigtc68f8372017-10-16 15:58:27 +0200844 if (submodule) {
Ralf Thielowa4ffbbb2020-01-15 19:07:01 +0100845 warning(_("Submodule in commit %s at path: "
Heiko Voigtc68f8372017-10-16 15:58:27 +0200846 "'%s' collides with a submodule named "
Ralf Thielowa4ffbbb2020-01-15 19:07:01 +0100847 "the same. Skipping it."),
Stefan Beller5fc84752018-06-14 10:31:07 -0700848 oid_to_hex(commit_oid), p->two->path);
Heiko Voigtc68f8372017-10-16 15:58:27 +0200849 name = NULL;
850 }
Brandon Williamsaacc5c12017-05-01 18:02:39 -0700851 }
Heiko Voigtc68f8372017-10-16 15:58:27 +0200852
853 if (!name)
854 continue;
855
856 commits = submodule_commits(changed, name);
857 oid_array_append(commits, &p->two->oid);
Brandon Williamsaacc5c12017-05-01 18:02:39 -0700858 }
859}
860
861/*
862 * Collect the paths of submodules in 'changed' which have changed based on
863 * the revisions as specified in 'argv'. Each entry in 'changed' will also
864 * have a corresponding 'struct oid_array' (in the 'util' field) which lists
865 * what the submodule pointers were updated to during the change.
866 */
Nguyễn Thái Ngọc Duy6245b982018-10-19 19:34:43 +0200867static void collect_changed_submodules(struct repository *r,
Nguyễn Thái Ngọc Duy174d1312018-09-21 17:57:35 +0200868 struct string_list *changed,
Jeff Kingc972bf42020-07-28 16:25:12 -0400869 struct strvec *argv)
Brandon Williamsaacc5c12017-05-01 18:02:39 -0700870{
871 struct rev_info rev;
872 const struct commit *commit;
Orgad Shaneha462bee2020-09-06 20:53:55 +0000873 int save_warning;
874 struct setup_revision_opt s_r_opt = {
875 .assume_dashdash = 1,
876 };
Brandon Williamsaacc5c12017-05-01 18:02:39 -0700877
Orgad Shaneha462bee2020-09-06 20:53:55 +0000878 save_warning = warn_on_object_refname_ambiguity;
879 warn_on_object_refname_ambiguity = 0;
Nguyễn Thái Ngọc Duy6245b982018-10-19 19:34:43 +0200880 repo_init_revisions(r, &rev, NULL);
Orgad Shaneha462bee2020-09-06 20:53:55 +0000881 setup_revisions(argv->nr, argv->v, &rev, &s_r_opt);
882 warn_on_object_refname_ambiguity = save_warning;
Brandon Williamsaacc5c12017-05-01 18:02:39 -0700883 if (prepare_revision_walk(&rev))
Ralf Thielowa4ffbbb2020-01-15 19:07:01 +0100884 die(_("revision walk setup failed"));
Brandon Williamsaacc5c12017-05-01 18:02:39 -0700885
886 while ((commit = get_revision(&rev))) {
887 struct rev_info diff_rev;
Heiko Voigtc68f8372017-10-16 15:58:27 +0200888 struct collect_changed_submodules_cb_data data;
Nguyễn Thái Ngọc Duy6245b982018-10-19 19:34:43 +0200889 data.repo = r;
Heiko Voigtc68f8372017-10-16 15:58:27 +0200890 data.changed = changed;
891 data.commit_oid = &commit->object.oid;
Brandon Williamsaacc5c12017-05-01 18:02:39 -0700892
Nguyễn Thái Ngọc Duy6245b982018-10-19 19:34:43 +0200893 repo_init_revisions(r, &diff_rev, NULL);
Brandon Williamsaacc5c12017-05-01 18:02:39 -0700894 diff_rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
895 diff_rev.diffopt.format_callback = collect_changed_submodules_cb;
Heiko Voigtc68f8372017-10-16 15:58:27 +0200896 diff_rev.diffopt.format_callback_data = &data;
Sergey Organovd01141d2020-09-29 14:31:22 +0300897 diff_rev.dense_combined_merges = 1;
898 diff_tree_combined_merge(commit, &diff_rev);
Brandon Williamsaacc5c12017-05-01 18:02:39 -0700899 }
900
901 reset_revision_walk();
902}
903
904static void free_submodules_oids(struct string_list *submodules)
905{
906 struct string_list_item *item;
907 for_each_string_list_item(item, submodules)
908 oid_array_clear((struct oid_array *) item->util);
909 string_list_clear(submodules, 1);
910}
911
Michael Haggerty7290ef52015-05-25 18:39:07 +0000912static int has_remote(const char *refname, const struct object_id *oid,
913 int flags, void *cb_data)
Fredrik Gustafssond2b17b32011-08-20 00:08:47 +0200914{
915 return 1;
916}
917
brian m. carlson1b7ba792017-03-31 01:39:59 +0000918static int append_oid_to_argv(const struct object_id *oid, void *data)
Fredrik Gustafssond2b17b32011-08-20 00:08:47 +0200919{
Jeff Kingc972bf42020-07-28 16:25:12 -0400920 struct strvec *argv = data;
921 strvec_push(argv, oid_to_hex(oid));
Heiko Voigt9cfa1c22016-11-16 16:11:05 +0100922 return 0;
923}
924
Stefan Beller3c96aa92017-09-12 10:30:27 -0700925struct has_commit_data {
Nguyễn Thái Ngọc Duy6245b982018-10-19 19:34:43 +0200926 struct repository *repo;
Stefan Beller3c96aa92017-09-12 10:30:27 -0700927 int result;
928 const char *path;
929};
930
brian m. carlson1b7ba792017-03-31 01:39:59 +0000931static int check_has_commit(const struct object_id *oid, void *data)
Fredrik Gustafssond2b17b32011-08-20 00:08:47 +0200932{
Stefan Beller3c96aa92017-09-12 10:30:27 -0700933 struct has_commit_data *cb = data;
Heiko Voigt5b6607d2016-11-16 16:11:06 +0100934
Nguyễn Thái Ngọc Duy6245b982018-10-19 19:34:43 +0200935 enum object_type type = oid_object_info(cb->repo, oid, NULL);
Heiko Voigt5b6607d2016-11-16 16:11:06 +0100936
Stefan Beller3c96aa92017-09-12 10:30:27 -0700937 switch (type) {
938 case OBJ_COMMIT:
939 return 0;
940 case OBJ_BAD:
941 /*
942 * Object is missing or invalid. If invalid, an error message
943 * has already been printed.
944 */
945 cb->result = 0;
946 return 0;
947 default:
948 die(_("submodule entry '%s' (%s) is a %s, not a commit"),
Brandon Williamsdebca9d2018-02-14 10:59:24 -0800949 cb->path, oid_to_hex(oid), type_name(type));
Stefan Beller3c96aa92017-09-12 10:30:27 -0700950 }
Heiko Voigt5b6607d2016-11-16 16:11:06 +0100951}
952
Nguyễn Thái Ngọc Duy6245b982018-10-19 19:34:43 +0200953static int submodule_has_commits(struct repository *r,
954 const char *path,
955 struct oid_array *commits)
Heiko Voigt5b6607d2016-11-16 16:11:06 +0100956{
Nguyễn Thái Ngọc Duy6245b982018-10-19 19:34:43 +0200957 struct has_commit_data has_commit = { r, 1, path };
Heiko Voigt5b6607d2016-11-16 16:11:06 +0100958
Brandon Williams7c8d2b02017-05-01 18:02:38 -0700959 /*
Ville Skyttä64127572017-06-25 13:20:41 +0300960 * Perform a cheap, but incorrect check for the existence of 'commits'.
Brandon Williams7c8d2b02017-05-01 18:02:38 -0700961 * This is done by adding the submodule's object store to the in-core
Ville Skyttä64127572017-06-25 13:20:41 +0300962 * object store, and then querying for each commit's existence. If we
Brandon Williams7c8d2b02017-05-01 18:02:38 -0700963 * do not have the commit object anywhere, there is no chance we have
964 * it in the object store of the correct submodule and have it
965 * reachable from a ref, so we can fail early without spawning rev-list
966 * which is expensive.
967 */
Heiko Voigt5b6607d2016-11-16 16:11:06 +0100968 if (add_submodule_odb(path))
969 return 0;
970
brian m. carlson910650d2017-03-31 01:40:00 +0000971 oid_array_for_each_unique(commits, check_has_commit, &has_commit);
Brandon Williams7c8d2b02017-05-01 18:02:38 -0700972
Stefan Beller3c96aa92017-09-12 10:30:27 -0700973 if (has_commit.result) {
Brandon Williams7c8d2b02017-05-01 18:02:38 -0700974 /*
975 * Even if the submodule is checked out and the commit is
976 * present, make sure it exists in the submodule's object store
977 * and that it is reachable from a ref.
978 */
979 struct child_process cp = CHILD_PROCESS_INIT;
980 struct strbuf out = STRBUF_INIT;
981
Jeff Kingc972bf42020-07-28 16:25:12 -0400982 strvec_pushl(&cp.args, "rev-list", "-n", "1", NULL);
Brandon Williams7c8d2b02017-05-01 18:02:38 -0700983 oid_array_for_each_unique(commits, append_oid_to_argv, &cp.args);
Jeff Kingc972bf42020-07-28 16:25:12 -0400984 strvec_pushl(&cp.args, "--not", "--all", NULL);
Brandon Williams7c8d2b02017-05-01 18:02:38 -0700985
986 prepare_submodule_repo_env(&cp.env_array);
987 cp.git_cmd = 1;
988 cp.no_stdin = 1;
989 cp.dir = path;
990
991 if (capture_command(&cp, &out, GIT_MAX_HEXSZ + 1) || out.len)
Stefan Beller3c96aa92017-09-12 10:30:27 -0700992 has_commit.result = 0;
Brandon Williams7c8d2b02017-05-01 18:02:38 -0700993
994 strbuf_release(&out);
995 }
996
Stefan Beller3c96aa92017-09-12 10:30:27 -0700997 return has_commit.result;
Heiko Voigt5b6607d2016-11-16 16:11:06 +0100998}
999
Nguyễn Thái Ngọc Duy6245b982018-10-19 19:34:43 +02001000static int submodule_needs_pushing(struct repository *r,
1001 const char *path,
1002 struct oid_array *commits)
Heiko Voigt5b6607d2016-11-16 16:11:06 +01001003{
Nguyễn Thái Ngọc Duy6245b982018-10-19 19:34:43 +02001004 if (!submodule_has_commits(r, path, commits))
Heiko Voigt250ab242016-11-16 16:11:07 +01001005 /*
1006 * NOTE: We do consider it safe to return "no" here. The
1007 * correct answer would be "We do not know" instead of
1008 * "No push needed", but it is quite hard to change
1009 * the submodule pointer without having the submodule
1010 * around. If a user did however change the submodules
1011 * without having the submodule around, this indicates
1012 * an expert who knows what they are doing or a
1013 * maintainer integrating work from other people. In
1014 * both cases it should be safe to skip this check.
1015 */
Fredrik Gustafssond2b17b32011-08-20 00:08:47 +02001016 return 0;
1017
1018 if (for_each_remote_ref_submodule(path, has_remote, NULL) > 0) {
René Scharfed3180272014-08-19 21:09:35 +02001019 struct child_process cp = CHILD_PROCESS_INIT;
Fredrik Gustafssond2b17b32011-08-20 00:08:47 +02001020 struct strbuf buf = STRBUF_INIT;
1021 int needs_pushing = 0;
1022
Jeff Kingc972bf42020-07-28 16:25:12 -04001023 strvec_push(&cp.args, "rev-list");
brian m. carlson910650d2017-03-31 01:40:00 +00001024 oid_array_for_each_unique(commits, append_oid_to_argv, &cp.args);
Jeff Kingc972bf42020-07-28 16:25:12 -04001025 strvec_pushl(&cp.args, "--not", "--remotes", "-n", "1" , NULL);
Heiko Voigt5b6607d2016-11-16 16:11:06 +01001026
Jeff Kingc12e8652016-04-28 09:39:15 -04001027 prepare_submodule_repo_env(&cp.env_array);
Fredrik Gustafssond2b17b32011-08-20 00:08:47 +02001028 cp.git_cmd = 1;
1029 cp.no_stdin = 1;
1030 cp.out = -1;
1031 cp.dir = path;
1032 if (start_command(&cp))
Ralf Thielowa4ffbbb2020-01-15 19:07:01 +01001033 die(_("Could not run 'git rev-list <commits> --not --remotes -n 1' command in submodule %s"),
Heiko Voigt5b6607d2016-11-16 16:11:06 +01001034 path);
brian m. carlsondb1ba2a2019-02-19 00:04:59 +00001035 if (strbuf_read(&buf, cp.out, the_hash_algo->hexsz + 1))
Fredrik Gustafssond2b17b32011-08-20 00:08:47 +02001036 needs_pushing = 1;
1037 finish_command(&cp);
1038 close(cp.out);
1039 strbuf_release(&buf);
1040 return needs_pushing;
1041 }
1042
1043 return 0;
1044}
1045
Nguyễn Thái Ngọc Duy6245b982018-10-19 19:34:43 +02001046int find_unpushed_submodules(struct repository *r,
Nguyễn Thái Ngọc Duy174d1312018-09-21 17:57:35 +02001047 struct oid_array *commits,
1048 const char *remotes_name,
1049 struct string_list *needs_pushing)
Fredrik Gustafssond2b17b32011-08-20 00:08:47 +02001050{
Heiko Voigt14739442016-11-16 16:11:04 +01001051 struct string_list submodules = STRING_LIST_INIT_DUP;
Heiko Voigtc68f8372017-10-16 15:58:27 +02001052 struct string_list_item *name;
Jeff Kingc972bf42020-07-28 16:25:12 -04001053 struct strvec argv = STRVEC_INIT;
Heiko Voigta762e512012-03-29 09:21:23 +02001054
Jeff Kingd70a9eb2020-07-28 20:37:20 -04001055 /* argv.v[0] will be ignored by setup_revisions */
Jeff Kingc972bf42020-07-28 16:25:12 -04001056 strvec_push(&argv, "find_unpushed_submodules");
brian m. carlson910650d2017-03-31 01:40:00 +00001057 oid_array_for_each_unique(commits, append_oid_to_argv, &argv);
Jeff Kingc972bf42020-07-28 16:25:12 -04001058 strvec_push(&argv, "--not");
1059 strvec_pushf(&argv, "--remotes=%s", remotes_name);
Heiko Voigt9cfa1c22016-11-16 16:11:05 +01001060
Nguyễn Thái Ngọc Duy6245b982018-10-19 19:34:43 +02001061 collect_changed_submodules(r, &submodules, &argv);
Fredrik Gustafssond2b17b32011-08-20 00:08:47 +02001062
Heiko Voigtc68f8372017-10-16 15:58:27 +02001063 for_each_string_list_item(name, &submodules) {
1064 struct oid_array *commits = name->util;
1065 const struct submodule *submodule;
1066 const char *path = NULL;
1067
brian m. carlson14228442021-04-26 01:02:56 +00001068 submodule = submodule_from_name(r, null_oid(), name->string);
Heiko Voigtc68f8372017-10-16 15:58:27 +02001069 if (submodule)
1070 path = submodule->path;
1071 else
1072 path = default_name_or_path(name->string);
1073
1074 if (!path)
1075 continue;
Heiko Voigt5b6607d2016-11-16 16:11:06 +01001076
Nguyễn Thái Ngọc Duy6245b982018-10-19 19:34:43 +02001077 if (submodule_needs_pushing(r, path, commits))
Brandon Williamsaacc5c12017-05-01 18:02:39 -07001078 string_list_insert(needs_pushing, path);
Heiko Voigt14739442016-11-16 16:11:04 +01001079 }
Brandon Williams610b2332017-04-28 16:53:58 -07001080
1081 free_submodules_oids(&submodules);
Jeff Kingc972bf42020-07-28 16:25:12 -04001082 strvec_clear(&argv);
Fredrik Gustafssond2b17b32011-08-20 00:08:47 +02001083
Heiko Voigta762e512012-03-29 09:21:23 +02001084 return needs_pushing->nr;
Fredrik Gustafssond2b17b32011-08-20 00:08:47 +02001085}
1086
Brandon Williams2a905562017-04-05 10:47:16 -07001087static int push_submodule(const char *path,
Brandon Williams06bf4ad2017-04-05 10:47:19 -07001088 const struct remote *remote,
Brandon Williams60fba4b2018-05-16 15:58:23 -07001089 const struct refspec *rs,
Brandon Williams2a905562017-04-05 10:47:16 -07001090 const struct string_list *push_options,
1091 int dry_run)
Heiko Voigteb21c732012-03-29 09:21:24 +02001092{
Heiko Voigteb21c732012-03-29 09:21:24 +02001093 if (for_each_remote_ref_submodule(path, has_remote, NULL) > 0) {
René Scharfed3180272014-08-19 21:09:35 +02001094 struct child_process cp = CHILD_PROCESS_INIT;
Jeff Kingc972bf42020-07-28 16:25:12 -04001095 strvec_push(&cp.args, "push");
Brandon Williams0301c822016-11-17 10:46:04 -08001096 if (dry_run)
Jeff Kingc972bf42020-07-28 16:25:12 -04001097 strvec_push(&cp.args, "--dry-run");
Heiko Voigteb21c732012-03-29 09:21:24 +02001098
Brandon Williams2a905562017-04-05 10:47:16 -07001099 if (push_options && push_options->nr) {
1100 const struct string_list_item *item;
1101 for_each_string_list_item(item, push_options)
Jeff Kingc972bf42020-07-28 16:25:12 -04001102 strvec_pushf(&cp.args, "--push-option=%s",
Jeff Kingf6d89422020-07-28 16:26:31 -04001103 item->string);
Brandon Williams2a905562017-04-05 10:47:16 -07001104 }
Brandon Williams06bf4ad2017-04-05 10:47:19 -07001105
1106 if (remote->origin != REMOTE_UNCONFIGURED) {
1107 int i;
Jeff Kingc972bf42020-07-28 16:25:12 -04001108 strvec_push(&cp.args, remote->name);
Brandon Williams60fba4b2018-05-16 15:58:23 -07001109 for (i = 0; i < rs->raw_nr; i++)
Jeff Kingc972bf42020-07-28 16:25:12 -04001110 strvec_push(&cp.args, rs->raw[i]);
Brandon Williams06bf4ad2017-04-05 10:47:19 -07001111 }
1112
Jeff Kingc12e8652016-04-28 09:39:15 -04001113 prepare_submodule_repo_env(&cp.env_array);
Heiko Voigteb21c732012-03-29 09:21:24 +02001114 cp.git_cmd = 1;
1115 cp.no_stdin = 1;
1116 cp.dir = path;
1117 if (run_command(&cp))
1118 return 0;
1119 close(cp.out);
1120 }
1121
1122 return 1;
1123}
1124
Brandon Williams06bf4ad2017-04-05 10:47:19 -07001125/*
1126 * Perform a check in the submodule to see if the remote and refspec work.
1127 * Die if the submodule can't be pushed.
1128 */
Brandon Williamsc7be7202017-07-20 10:40:37 -07001129static void submodule_push_check(const char *path, const char *head,
1130 const struct remote *remote,
Brandon Williams60fba4b2018-05-16 15:58:23 -07001131 const struct refspec *rs)
Brandon Williams06bf4ad2017-04-05 10:47:19 -07001132{
1133 struct child_process cp = CHILD_PROCESS_INIT;
1134 int i;
1135
Jeff Kingc972bf42020-07-28 16:25:12 -04001136 strvec_push(&cp.args, "submodule--helper");
1137 strvec_push(&cp.args, "push-check");
1138 strvec_push(&cp.args, head);
1139 strvec_push(&cp.args, remote->name);
Brandon Williams06bf4ad2017-04-05 10:47:19 -07001140
Brandon Williams60fba4b2018-05-16 15:58:23 -07001141 for (i = 0; i < rs->raw_nr; i++)
Jeff Kingc972bf42020-07-28 16:25:12 -04001142 strvec_push(&cp.args, rs->raw[i]);
Brandon Williams06bf4ad2017-04-05 10:47:19 -07001143
1144 prepare_submodule_repo_env(&cp.env_array);
1145 cp.git_cmd = 1;
1146 cp.no_stdin = 1;
1147 cp.no_stdout = 1;
1148 cp.dir = path;
1149
1150 /*
1151 * Simply indicate if 'submodule--helper push-check' failed.
1152 * More detailed error information will be provided by the
1153 * child process.
1154 */
1155 if (run_command(&cp))
Ralf Thielowa4ffbbb2020-01-15 19:07:01 +01001156 die(_("process for submodule '%s' failed"), path);
Brandon Williams06bf4ad2017-04-05 10:47:19 -07001157}
1158
Nguyễn Thái Ngọc Duy6245b982018-10-19 19:34:43 +02001159int push_unpushed_submodules(struct repository *r,
Nguyễn Thái Ngọc Duy174d1312018-09-21 17:57:35 +02001160 struct oid_array *commits,
Brandon Williams06bf4ad2017-04-05 10:47:19 -07001161 const struct remote *remote,
Brandon Williams60fba4b2018-05-16 15:58:23 -07001162 const struct refspec *rs,
Brandon Williams2a905562017-04-05 10:47:16 -07001163 const struct string_list *push_options,
Brandon Williams0301c822016-11-17 10:46:04 -08001164 int dry_run)
Heiko Voigteb21c732012-03-29 09:21:24 +02001165{
1166 int i, ret = 1;
Tanay Abhraf93d7c62014-07-18 02:19:00 -07001167 struct string_list needs_pushing = STRING_LIST_INIT_DUP;
Heiko Voigteb21c732012-03-29 09:21:24 +02001168
Nguyễn Thái Ngọc Duy6245b982018-10-19 19:34:43 +02001169 if (!find_unpushed_submodules(r, commits,
Nguyễn Thái Ngọc Duy174d1312018-09-21 17:57:35 +02001170 remote->name, &needs_pushing))
Heiko Voigteb21c732012-03-29 09:21:24 +02001171 return 1;
1172
Brandon Williams06bf4ad2017-04-05 10:47:19 -07001173 /*
1174 * Verify that the remote and refspec can be propagated to all
1175 * submodules. This check can be skipped if the remote and refspec
1176 * won't be propagated due to the remote being unconfigured (e.g. a URL
1177 * instead of a remote name).
1178 */
Brandon Williamsc7be7202017-07-20 10:40:37 -07001179 if (remote->origin != REMOTE_UNCONFIGURED) {
1180 char *head;
1181 struct object_id head_oid;
1182
brian m. carlson0f2dc722017-10-15 22:06:55 +00001183 head = resolve_refdup("HEAD", 0, &head_oid, NULL);
Brandon Williamsc7be7202017-07-20 10:40:37 -07001184 if (!head)
1185 die(_("Failed to resolve HEAD as a valid ref."));
1186
Brandon Williams06bf4ad2017-04-05 10:47:19 -07001187 for (i = 0; i < needs_pushing.nr; i++)
1188 submodule_push_check(needs_pushing.items[i].string,
Brandon Williams60fba4b2018-05-16 15:58:23 -07001189 head, remote, rs);
Brandon Williamsc7be7202017-07-20 10:40:37 -07001190 free(head);
1191 }
Brandon Williams06bf4ad2017-04-05 10:47:19 -07001192
1193 /* Actually push the submodules */
Heiko Voigteb21c732012-03-29 09:21:24 +02001194 for (i = 0; i < needs_pushing.nr; i++) {
1195 const char *path = needs_pushing.items[i].string;
Ralf Thielowa4ffbbb2020-01-15 19:07:01 +01001196 fprintf(stderr, _("Pushing submodule '%s'\n"), path);
Brandon Williams60fba4b2018-05-16 15:58:23 -07001197 if (!push_submodule(path, remote, rs,
Brandon Williams06bf4ad2017-04-05 10:47:19 -07001198 push_options, dry_run)) {
Ralf Thielowa4ffbbb2020-01-15 19:07:01 +01001199 fprintf(stderr, _("Unable to push submodule '%s'\n"), path);
Heiko Voigteb21c732012-03-29 09:21:24 +02001200 ret = 0;
1201 }
1202 }
1203
1204 string_list_clear(&needs_pushing, 0);
1205
1206 return ret;
1207}
1208
Brandon Williams419fd782017-04-28 16:53:57 -07001209static int append_oid_to_array(const char *ref, const struct object_id *oid,
1210 int flags, void *data)
Jeff King6859de42011-09-12 15:56:52 -04001211{
Brandon Williams419fd782017-04-28 16:53:57 -07001212 struct oid_array *array = data;
1213 oid_array_append(array, oid);
Jeff King6859de42011-09-12 15:56:52 -04001214 return 0;
1215}
1216
brian m. carlson2eb80bc2017-03-26 16:01:35 +00001217void check_for_new_submodule_commits(struct object_id *oid)
Jens Lehmann88a21972011-03-06 23:10:46 +01001218{
Jeff King6859de42011-09-12 15:56:52 -04001219 if (!initialized_fetch_ref_tips) {
Brandon Williams419fd782017-04-28 16:53:57 -07001220 for_each_ref(append_oid_to_array, &ref_tips_before_fetch);
Jeff King6859de42011-09-12 15:56:52 -04001221 initialized_fetch_ref_tips = 1;
1222 }
1223
brian m. carlson910650d2017-03-31 01:40:00 +00001224 oid_array_append(&ref_tips_after_fetch, oid);
Jeff King6859de42011-09-12 15:56:52 -04001225}
1226
Stefan Beller16dd6fe2018-11-28 16:27:51 -08001227static void calculate_changed_submodule_paths(struct repository *r,
1228 struct string_list *changed_submodule_names)
Jeff King6859de42011-09-12 15:56:52 -04001229{
Jeff Kingc972bf42020-07-28 16:25:12 -04001230 struct strvec argv = STRVEC_INIT;
Stefan Bellerbcd73372018-11-28 16:27:52 -08001231 struct string_list_item *name;
Jens Lehmann88a21972011-03-06 23:10:46 +01001232
Jens Lehmann18322ba2011-09-09 20:22:03 +02001233 /* No need to check if there are no submodules configured */
Nguyễn Thái Ngọc Duy6245b982018-10-19 19:34:43 +02001234 if (!submodule_from_path(r, NULL, NULL))
Jens Lehmann18322ba2011-09-09 20:22:03 +02001235 return;
1236
Jeff Kingc972bf42020-07-28 16:25:12 -04001237 strvec_push(&argv, "--"); /* argv[0] program name */
brian m. carlson910650d2017-03-31 01:40:00 +00001238 oid_array_for_each_unique(&ref_tips_after_fetch,
Brandon Williamsd1a84602017-04-28 16:53:59 -07001239 append_oid_to_argv, &argv);
Jeff Kingc972bf42020-07-28 16:25:12 -04001240 strvec_push(&argv, "--not");
brian m. carlson910650d2017-03-31 01:40:00 +00001241 oid_array_for_each_unique(&ref_tips_before_fetch,
Brandon Williamsd1a84602017-04-28 16:53:59 -07001242 append_oid_to_argv, &argv);
Jens Lehmann88a21972011-03-06 23:10:46 +01001243
1244 /*
1245 * Collect all submodules (whether checked out or not) for which new
Heiko Voigtc68f8372017-10-16 15:58:27 +02001246 * commits have been recorded upstream in "changed_submodule_names".
Jens Lehmann88a21972011-03-06 23:10:46 +01001247 */
Stefan Bellerbcd73372018-11-28 16:27:52 -08001248 collect_changed_submodules(r, changed_submodule_names, &argv);
Brandon Williamsaacc5c12017-05-01 18:02:39 -07001249
Stefan Bellerbcd73372018-11-28 16:27:52 -08001250 for_each_string_list_item(name, changed_submodule_names) {
Heiko Voigtc68f8372017-10-16 15:58:27 +02001251 struct oid_array *commits = name->util;
1252 const struct submodule *submodule;
1253 const char *path = NULL;
1254
brian m. carlson14228442021-04-26 01:02:56 +00001255 submodule = submodule_from_name(r, null_oid(), name->string);
Heiko Voigtc68f8372017-10-16 15:58:27 +02001256 if (submodule)
1257 path = submodule->path;
1258 else
1259 path = default_name_or_path(name->string);
1260
1261 if (!path)
1262 continue;
Brandon Williamsaacc5c12017-05-01 18:02:39 -07001263
Stefan Bellerbcd73372018-11-28 16:27:52 -08001264 if (submodule_has_commits(r, path, commits)) {
1265 oid_array_clear(commits);
1266 *name->string = '\0';
1267 }
Jens Lehmann88a21972011-03-06 23:10:46 +01001268 }
Jeff King6859de42011-09-12 15:56:52 -04001269
Stefan Bellerbcd73372018-11-28 16:27:52 -08001270 string_list_remove_empty_items(changed_submodule_names, 1);
1271
Jeff Kingc972bf42020-07-28 16:25:12 -04001272 strvec_clear(&argv);
brian m. carlson910650d2017-03-31 01:40:00 +00001273 oid_array_clear(&ref_tips_before_fetch);
1274 oid_array_clear(&ref_tips_after_fetch);
Jeff King6859de42011-09-12 15:56:52 -04001275 initialized_fetch_ref_tips = 0;
Jens Lehmann88a21972011-03-06 23:10:46 +01001276}
1277
Nguyễn Thái Ngọc Duy6245b982018-10-19 19:34:43 +02001278int submodule_touches_in_range(struct repository *r,
Nguyễn Thái Ngọc Duy174d1312018-09-21 17:57:35 +02001279 struct object_id *excl_oid,
Stefan Bellera6d7eb22017-06-23 12:13:02 -07001280 struct object_id *incl_oid)
1281{
1282 struct string_list subs = STRING_LIST_INIT_DUP;
Jeff Kingc972bf42020-07-28 16:25:12 -04001283 struct strvec args = STRVEC_INIT;
Stefan Bellera6d7eb22017-06-23 12:13:02 -07001284 int ret;
1285
Stefan Bellera6d7eb22017-06-23 12:13:02 -07001286 /* No need to check if there are no submodules configured */
Nguyễn Thái Ngọc Duy6245b982018-10-19 19:34:43 +02001287 if (!submodule_from_path(r, NULL, NULL))
Stefan Bellera6d7eb22017-06-23 12:13:02 -07001288 return 0;
1289
Jeff Kingc972bf42020-07-28 16:25:12 -04001290 strvec_push(&args, "--"); /* args[0] program name */
1291 strvec_push(&args, oid_to_hex(incl_oid));
Jonathan Tan4d36f882018-05-24 13:47:29 -07001292 if (!is_null_oid(excl_oid)) {
Jeff Kingc972bf42020-07-28 16:25:12 -04001293 strvec_push(&args, "--not");
1294 strvec_push(&args, oid_to_hex(excl_oid));
Jonathan Tan4d36f882018-05-24 13:47:29 -07001295 }
Stefan Bellera6d7eb22017-06-23 12:13:02 -07001296
Nguyễn Thái Ngọc Duy6245b982018-10-19 19:34:43 +02001297 collect_changed_submodules(r, &subs, &args);
Stefan Bellera6d7eb22017-06-23 12:13:02 -07001298 ret = subs.nr;
1299
Jeff Kingc972bf42020-07-28 16:25:12 -04001300 strvec_clear(&args);
Stefan Bellera6d7eb22017-06-23 12:13:02 -07001301
1302 free_submodules_oids(&subs);
1303 return ret;
1304}
1305
Stefan Bellerfe85ee62015-12-15 16:04:11 -08001306struct submodule_parallel_fetch {
1307 int count;
Jeff Kingc972bf42020-07-28 16:25:12 -04001308 struct strvec args;
Brandon Williamse7241972017-12-12 11:53:52 -08001309 struct repository *r;
Stefan Bellerfe85ee62015-12-15 16:04:11 -08001310 const char *prefix;
1311 int command_line_option;
Brandon Williams8fa29152017-08-02 12:49:19 -07001312 int default_option;
Stefan Bellerfe85ee62015-12-15 16:04:11 -08001313 int quiet;
1314 int result;
Stefan Beller16dd6fe2018-11-28 16:27:51 -08001315
1316 struct string_list changed_submodule_names;
Stefan Bellerbe76c212018-12-06 13:26:55 -08001317
1318 /* Pending fetches by OIDs */
1319 struct fetch_task **oid_fetch_tasks;
1320 int oid_fetch_tasks_nr, oid_fetch_tasks_alloc;
Emily Shaffer02225402020-01-16 14:20:12 -08001321
1322 struct strbuf submodules_with_errors;
Stefan Bellerfe85ee62015-12-15 16:04:11 -08001323};
Jeff Kingc972bf42020-07-28 16:25:12 -04001324#define SPF_INIT {0, STRVEC_INIT, NULL, NULL, 0, 0, 0, 0, \
Stefan Bellerbe76c212018-12-06 13:26:55 -08001325 STRING_LIST_INIT_DUP, \
Emily Shaffer02225402020-01-16 14:20:12 -08001326 NULL, 0, 0, STRBUF_INIT}
Stefan Bellerfe85ee62015-12-15 16:04:11 -08001327
Heiko Voigt4b4aced2017-10-16 15:59:05 +02001328static int get_fetch_recurse_config(const struct submodule *submodule,
1329 struct submodule_parallel_fetch *spf)
1330{
1331 if (spf->command_line_option != RECURSE_SUBMODULES_DEFAULT)
1332 return spf->command_line_option;
1333
1334 if (submodule) {
1335 char *key;
1336 const char *value;
1337
1338 int fetch_recurse = submodule->fetch_recurse;
1339 key = xstrfmt("submodule.%s.fetchRecurseSubmodules", submodule->name);
Jeff Kingf1de9812020-08-14 12:17:36 -04001340 if (!repo_config_get_string_tmp(spf->r, key, &value)) {
Heiko Voigt4b4aced2017-10-16 15:59:05 +02001341 fetch_recurse = parse_fetch_recurse_submodules_arg(key, value);
1342 }
1343 free(key);
1344
1345 if (fetch_recurse != RECURSE_SUBMODULES_NONE)
1346 /* local config overrules everything except commandline */
1347 return fetch_recurse;
1348 }
1349
1350 return spf->default_option;
1351}
1352
Stefan Bellerbe76c212018-12-06 13:26:55 -08001353/*
1354 * Fetch in progress (if callback data) or
1355 * pending (if in oid_fetch_tasks in struct submodule_parallel_fetch)
1356 */
1357struct fetch_task {
1358 struct repository *repo;
1359 const struct submodule *sub;
1360 unsigned free_sub : 1; /* Do we need to free the submodule? */
1361
1362 struct oid_array *commits; /* Ensure these commits are fetched */
1363};
1364
1365/**
1366 * When a submodule is not defined in .gitmodules, we cannot access it
1367 * via the regular submodule-config. Create a fake submodule, which we can
1368 * work on.
1369 */
1370static const struct submodule *get_non_gitmodules_submodule(const char *path)
1371{
1372 struct submodule *ret = NULL;
1373 const char *name = default_name_or_path(path);
1374
1375 if (!name)
1376 return NULL;
1377
1378 ret = xmalloc(sizeof(*ret));
1379 memset(ret, 0, sizeof(*ret));
1380 ret->path = name;
1381 ret->name = name;
1382
1383 return (const struct submodule *) ret;
1384}
1385
1386static struct fetch_task *fetch_task_create(struct repository *r,
1387 const char *path)
1388{
1389 struct fetch_task *task = xmalloc(sizeof(*task));
1390 memset(task, 0, sizeof(*task));
1391
brian m. carlson14228442021-04-26 01:02:56 +00001392 task->sub = submodule_from_path(r, null_oid(), path);
Stefan Bellerbe76c212018-12-06 13:26:55 -08001393 if (!task->sub) {
1394 /*
1395 * No entry in .gitmodules? Technically not a submodule,
1396 * but historically we supported repositories that happen to be
1397 * in-place where a gitlink is. Keep supporting them.
1398 */
1399 task->sub = get_non_gitmodules_submodule(path);
1400 if (!task->sub) {
1401 free(task);
1402 return NULL;
1403 }
1404
1405 task->free_sub = 1;
1406 }
1407
1408 return task;
1409}
1410
1411static void fetch_task_release(struct fetch_task *p)
1412{
1413 if (p->free_sub)
1414 free((void*)p->sub);
1415 p->free_sub = 0;
1416 p->sub = NULL;
1417
1418 if (p->repo)
1419 repo_clear(p->repo);
1420 FREE_AND_NULL(p->repo);
1421}
1422
Stefan Beller26f80cc2018-11-28 16:27:54 -08001423static struct repository *get_submodule_repo_for(struct repository *r,
1424 const struct submodule *sub)
1425{
1426 struct repository *ret = xmalloc(sizeof(*ret));
1427
1428 if (repo_submodule_init(ret, r, sub)) {
1429 /*
1430 * No entry in .gitmodules? Technically not a submodule,
1431 * but historically we supported repositories that happen to be
1432 * in-place where a gitlink is. Keep supporting them.
1433 */
1434 struct strbuf gitdir = STRBUF_INIT;
1435 strbuf_repo_worktree_path(&gitdir, r, "%s/.git", sub->path);
1436 if (repo_init(ret, gitdir.buf, NULL)) {
1437 strbuf_release(&gitdir);
1438 free(ret);
1439 return NULL;
1440 }
1441 strbuf_release(&gitdir);
1442 }
1443
1444 return ret;
1445}
1446
Stefan Bellerfe85ee62015-12-15 16:04:11 -08001447static int get_next_submodule(struct child_process *cp,
1448 struct strbuf *err, void *data, void **task_cb)
Jens Lehmann7dce19d2010-11-12 13:54:52 +01001449{
Stefan Bellerfe85ee62015-12-15 16:04:11 -08001450 struct submodule_parallel_fetch *spf = data;
Jens Lehmann7dce19d2010-11-12 13:54:52 +01001451
Brandon Williamse7241972017-12-12 11:53:52 -08001452 for (; spf->count < spf->r->index->cache_nr; spf->count++) {
Brandon Williamse7241972017-12-12 11:53:52 -08001453 const struct cache_entry *ce = spf->r->index->cache[spf->count];
Stefan Beller26f80cc2018-11-28 16:27:54 -08001454 const char *default_argv;
Stefan Bellerbe76c212018-12-06 13:26:55 -08001455 struct fetch_task *task;
Jens Lehmann7dce19d2010-11-12 13:54:52 +01001456
1457 if (!S_ISGITLINK(ce->ce_mode))
1458 continue;
1459
Stefan Bellerbe76c212018-12-06 13:26:55 -08001460 task = fetch_task_create(spf->r, ce->name);
1461 if (!task)
1462 continue;
Brandon Williams492c6c42017-08-03 11:19:51 -07001463
Stefan Bellerbe76c212018-12-06 13:26:55 -08001464 switch (get_fetch_recurse_config(task->sub, spf))
Heiko Voigt4b4aced2017-10-16 15:59:05 +02001465 {
1466 default:
1467 case RECURSE_SUBMODULES_DEFAULT:
1468 case RECURSE_SUBMODULES_ON_DEMAND:
Stefan Bellerbe76c212018-12-06 13:26:55 -08001469 if (!task->sub ||
Stefan Beller08a297b2018-11-28 16:27:50 -08001470 !string_list_lookup(
Stefan Beller16dd6fe2018-11-28 16:27:51 -08001471 &spf->changed_submodule_names,
Stefan Bellerbe76c212018-12-06 13:26:55 -08001472 task->sub->name))
Jens Lehmann8f0700d2011-03-06 23:11:21 +01001473 continue;
1474 default_argv = "on-demand";
Heiko Voigt4b4aced2017-10-16 15:59:05 +02001475 break;
1476 case RECURSE_SUBMODULES_ON:
1477 default_argv = "yes";
1478 break;
1479 case RECURSE_SUBMODULES_OFF:
1480 continue;
Jens Lehmannbe254a02010-11-11 00:55:02 +01001481 }
1482
Stefan Bellerbe76c212018-12-06 13:26:55 -08001483 task->repo = get_submodule_repo_for(spf->r, task->sub);
1484 if (task->repo) {
1485 struct strbuf submodule_prefix = STRBUF_INIT;
Stefan Bellerfe85ee62015-12-15 16:04:11 -08001486 child_process_init(cp);
Stefan Bellerbe76c212018-12-06 13:26:55 -08001487 cp->dir = task->repo->gitdir;
Stefan Bellera62387b2018-11-28 16:27:55 -08001488 prepare_submodule_repo_env_in_gitdir(&cp->env_array);
Stefan Bellerfe85ee62015-12-15 16:04:11 -08001489 cp->git_cmd = 1;
1490 if (!spf->quiet)
Ralf Thielowa4ffbbb2020-01-15 19:07:01 +01001491 strbuf_addf(err, _("Fetching submodule %s%s\n"),
Stefan Bellerfe85ee62015-12-15 16:04:11 -08001492 spf->prefix, ce->name);
Jeff Kingc972bf42020-07-28 16:25:12 -04001493 strvec_init(&cp->args);
Jeff Kingd70a9eb2020-07-28 20:37:20 -04001494 strvec_pushv(&cp->args, spf->args.v);
Jeff Kingc972bf42020-07-28 16:25:12 -04001495 strvec_push(&cp->args, default_argv);
1496 strvec_push(&cp->args, "--submodule-prefix");
Stefan Bellerbe76c212018-12-06 13:26:55 -08001497
1498 strbuf_addf(&submodule_prefix, "%s%s/",
1499 spf->prefix,
1500 task->sub->path);
Jeff Kingc972bf42020-07-28 16:25:12 -04001501 strvec_push(&cp->args, submodule_prefix.buf);
Stefan Beller26f80cc2018-11-28 16:27:54 -08001502
Stefan Bellerfe85ee62015-12-15 16:04:11 -08001503 spf->count++;
Stefan Bellerbe76c212018-12-06 13:26:55 -08001504 *task_cb = task;
1505
1506 strbuf_release(&submodule_prefix);
Stefan Bellerfe85ee62015-12-15 16:04:11 -08001507 return 1;
Stefan Beller26f80cc2018-11-28 16:27:54 -08001508 } else {
Peter Kaestle505a2762020-12-09 11:58:44 +01001509 struct strbuf empty_submodule_path = STRBUF_INIT;
Stefan Bellerbe76c212018-12-06 13:26:55 -08001510
1511 fetch_task_release(task);
1512 free(task);
1513
Stefan Beller26f80cc2018-11-28 16:27:54 -08001514 /*
1515 * An empty directory is normal,
1516 * the submodule is not initialized
1517 */
Peter Kaestle505a2762020-12-09 11:58:44 +01001518 strbuf_addf(&empty_submodule_path, "%s/%s/",
1519 spf->r->worktree,
1520 ce->name);
Stefan Beller26f80cc2018-11-28 16:27:54 -08001521 if (S_ISGITLINK(ce->ce_mode) &&
Peter Kaestle505a2762020-12-09 11:58:44 +01001522 !is_empty_dir(empty_submodule_path.buf)) {
Stefan Beller26f80cc2018-11-28 16:27:54 -08001523 spf->result = 1;
1524 strbuf_addf(err,
Emily Shaffer303b3c12020-02-06 16:48:33 -08001525 _("Could not access submodule '%s'\n"),
Stefan Beller26f80cc2018-11-28 16:27:54 -08001526 ce->name);
1527 }
Peter Kaestle505a2762020-12-09 11:58:44 +01001528 strbuf_release(&empty_submodule_path);
Stefan Bellerfe85ee62015-12-15 16:04:11 -08001529 }
Jens Lehmann7dce19d2010-11-12 13:54:52 +01001530 }
Stefan Bellerbe76c212018-12-06 13:26:55 -08001531
1532 if (spf->oid_fetch_tasks_nr) {
1533 struct fetch_task *task =
1534 spf->oid_fetch_tasks[spf->oid_fetch_tasks_nr - 1];
1535 struct strbuf submodule_prefix = STRBUF_INIT;
1536 spf->oid_fetch_tasks_nr--;
1537
1538 strbuf_addf(&submodule_prefix, "%s%s/",
1539 spf->prefix, task->sub->path);
1540
1541 child_process_init(cp);
1542 prepare_submodule_repo_env_in_gitdir(&cp->env_array);
1543 cp->git_cmd = 1;
1544 cp->dir = task->repo->gitdir;
1545
Jeff Kingc972bf42020-07-28 16:25:12 -04001546 strvec_init(&cp->args);
Jeff Kingd70a9eb2020-07-28 20:37:20 -04001547 strvec_pushv(&cp->args, spf->args.v);
Jeff Kingc972bf42020-07-28 16:25:12 -04001548 strvec_push(&cp->args, "on-demand");
1549 strvec_push(&cp->args, "--submodule-prefix");
1550 strvec_push(&cp->args, submodule_prefix.buf);
Stefan Bellerbe76c212018-12-06 13:26:55 -08001551
1552 /* NEEDSWORK: have get_default_remote from submodule--helper */
Jeff Kingc972bf42020-07-28 16:25:12 -04001553 strvec_push(&cp->args, "origin");
Stefan Bellerbe76c212018-12-06 13:26:55 -08001554 oid_array_for_each_unique(task->commits,
1555 append_oid_to_argv, &cp->args);
1556
1557 *task_cb = task;
1558 strbuf_release(&submodule_prefix);
1559 return 1;
1560 }
1561
Stefan Bellerfe85ee62015-12-15 16:04:11 -08001562 return 0;
1563}
1564
Stefan Beller2a73b3d2016-02-29 13:57:06 -08001565static int fetch_start_failure(struct strbuf *err,
Stefan Bellerfe85ee62015-12-15 16:04:11 -08001566 void *cb, void *task_cb)
1567{
1568 struct submodule_parallel_fetch *spf = cb;
Stefan Bellerbe76c212018-12-06 13:26:55 -08001569 struct fetch_task *task = task_cb;
Stefan Bellerfe85ee62015-12-15 16:04:11 -08001570
1571 spf->result = 1;
1572
Stefan Bellerbe76c212018-12-06 13:26:55 -08001573 fetch_task_release(task);
Stefan Bellerfe85ee62015-12-15 16:04:11 -08001574 return 0;
1575}
1576
Stefan Bellerbe76c212018-12-06 13:26:55 -08001577static int commit_missing_in_sub(const struct object_id *oid, void *data)
1578{
1579 struct repository *subrepo = data;
1580
1581 enum object_type type = oid_object_info(subrepo, oid, NULL);
1582
1583 return type != OBJ_COMMIT;
1584}
1585
Stefan Beller2a73b3d2016-02-29 13:57:06 -08001586static int fetch_finish(int retvalue, struct strbuf *err,
1587 void *cb, void *task_cb)
Stefan Bellerfe85ee62015-12-15 16:04:11 -08001588{
1589 struct submodule_parallel_fetch *spf = cb;
Stefan Bellerbe76c212018-12-06 13:26:55 -08001590 struct fetch_task *task = task_cb;
1591
1592 struct string_list_item *it;
1593 struct oid_array *commits;
Stefan Bellerfe85ee62015-12-15 16:04:11 -08001594
Emily Shaffer02225402020-01-16 14:20:12 -08001595 if (!task || !task->sub)
1596 BUG("callback cookie bogus");
1597
1598 if (retvalue) {
Jonathan Tanbd5e5672019-03-13 10:57:38 -07001599 /*
1600 * NEEDSWORK: This indicates that the overall fetch
1601 * failed, even though there may be a subsequent fetch
1602 * by commit hash that might work. It may be a good
1603 * idea to not indicate failure in this case, and only
1604 * indicate failure if the subsequent fetch fails.
1605 */
Stefan Bellerfe85ee62015-12-15 16:04:11 -08001606 spf->result = 1;
1607
Emily Shaffer02225402020-01-16 14:20:12 -08001608 strbuf_addf(&spf->submodules_with_errors, "\t%s\n",
1609 task->sub->name);
1610 }
Stefan Bellerbe76c212018-12-06 13:26:55 -08001611
1612 /* Is this the second time we process this submodule? */
1613 if (task->commits)
1614 goto out;
1615
1616 it = string_list_lookup(&spf->changed_submodule_names, task->sub->name);
1617 if (!it)
1618 /* Could be an unchanged submodule, not contained in the list */
1619 goto out;
1620
1621 commits = it->util;
1622 oid_array_filter(commits,
1623 commit_missing_in_sub,
1624 task->repo);
1625
1626 /* Are there commits we want, but do not exist? */
1627 if (commits->nr) {
1628 task->commits = commits;
1629 ALLOC_GROW(spf->oid_fetch_tasks,
1630 spf->oid_fetch_tasks_nr + 1,
1631 spf->oid_fetch_tasks_alloc);
1632 spf->oid_fetch_tasks[spf->oid_fetch_tasks_nr] = task;
1633 spf->oid_fetch_tasks_nr++;
1634 return 0;
1635 }
1636
1637out:
1638 fetch_task_release(task);
1639
Stefan Bellerfe85ee62015-12-15 16:04:11 -08001640 return 0;
1641}
1642
Brandon Williamse7241972017-12-12 11:53:52 -08001643int fetch_populated_submodules(struct repository *r,
Jeff Kingc972bf42020-07-28 16:25:12 -04001644 const struct strvec *options,
Stefan Bellerfe85ee62015-12-15 16:04:11 -08001645 const char *prefix, int command_line_option,
Brandon Williams8fa29152017-08-02 12:49:19 -07001646 int default_option,
Stefan Beller62104ba2015-12-15 16:04:12 -08001647 int quiet, int max_parallel_jobs)
Stefan Bellerfe85ee62015-12-15 16:04:11 -08001648{
1649 int i;
Stefan Bellerfe85ee62015-12-15 16:04:11 -08001650 struct submodule_parallel_fetch spf = SPF_INIT;
1651
Brandon Williamse7241972017-12-12 11:53:52 -08001652 spf.r = r;
Stefan Bellerfe85ee62015-12-15 16:04:11 -08001653 spf.command_line_option = command_line_option;
Brandon Williams8fa29152017-08-02 12:49:19 -07001654 spf.default_option = default_option;
Stefan Bellerfe85ee62015-12-15 16:04:11 -08001655 spf.quiet = quiet;
1656 spf.prefix = prefix;
1657
Brandon Williamse7241972017-12-12 11:53:52 -08001658 if (!r->worktree)
Stefan Bellerfe85ee62015-12-15 16:04:11 -08001659 goto out;
1660
Brandon Williamse7241972017-12-12 11:53:52 -08001661 if (repo_read_index(r) < 0)
Ralf Thielowa4ffbbb2020-01-15 19:07:01 +01001662 die(_("index file corrupt"));
Stefan Bellerfe85ee62015-12-15 16:04:11 -08001663
Jeff Kingc972bf42020-07-28 16:25:12 -04001664 strvec_push(&spf.args, "fetch");
Jeff Kingd70a9eb2020-07-28 20:37:20 -04001665 for (i = 0; i < options->nr; i++)
1666 strvec_push(&spf.args, options->v[i]);
Jeff Kingc972bf42020-07-28 16:25:12 -04001667 strvec_push(&spf.args, "--recurse-submodules-default");
Stefan Bellerfe85ee62015-12-15 16:04:11 -08001668 /* default value, "--submodule-prefix" and its value are added later */
1669
Stefan Beller16dd6fe2018-11-28 16:27:51 -08001670 calculate_changed_submodule_paths(r, &spf.changed_submodule_names);
1671 string_list_sort(&spf.changed_submodule_names);
Jeff Hostetleree4512e2019-02-22 14:25:01 -08001672 run_processes_parallel_tr2(max_parallel_jobs,
1673 get_next_submodule,
1674 fetch_start_failure,
1675 fetch_finish,
1676 &spf,
1677 "submodule", "parallel/fetch");
Stefan Bellerfe85ee62015-12-15 16:04:11 -08001678
Emily Shaffer02225402020-01-16 14:20:12 -08001679 if (spf.submodules_with_errors.len > 0)
1680 fprintf(stderr, _("Errors during submodule fetch:\n%s"),
1681 spf.submodules_with_errors.buf);
1682
1683
Jeff Kingc972bf42020-07-28 16:25:12 -04001684 strvec_clear(&spf.args);
Jens Lehmann88a21972011-03-06 23:10:46 +01001685out:
Stefan Bellerbcd73372018-11-28 16:27:52 -08001686 free_submodules_oids(&spf.changed_submodule_names);
Stefan Bellerfe85ee62015-12-15 16:04:11 -08001687 return spf.result;
Jens Lehmann7dce19d2010-11-12 13:54:52 +01001688}
1689
Jens Lehmann3bfc4502010-03-13 23:00:27 +01001690unsigned is_submodule_modified(const char *path, int ignore_untracked)
Jens Lehmannee6fc512010-01-16 18:42:24 +01001691{
René Scharfed3180272014-08-19 21:09:35 +02001692 struct child_process cp = CHILD_PROCESS_INIT;
Jens Lehmannee6fc512010-01-16 18:42:24 +01001693 struct strbuf buf = STRBUF_INIT;
Stefan Belleraf6865a2017-03-24 17:36:06 -07001694 FILE *fp;
Jens Lehmannc7e1a732010-03-04 22:20:33 +01001695 unsigned dirty_submodule = 0;
Jens Lehmanneee49b62010-04-10 19:01:12 +02001696 const char *git_dir;
Stefan Belleraf6865a2017-03-24 17:36:06 -07001697 int ignore_cp_exit_code = 0;
Jens Lehmannee6fc512010-01-16 18:42:24 +01001698
Jens Lehmanneee49b62010-04-10 19:01:12 +02001699 strbuf_addf(&buf, "%s/.git", path);
Junio C Hamano13d6ec92011-08-22 14:04:56 -07001700 git_dir = read_gitfile(buf.buf);
Jens Lehmanneee49b62010-04-10 19:01:12 +02001701 if (!git_dir)
1702 git_dir = buf.buf;
Stefan Beller5c896f72017-03-24 17:36:08 -07001703 if (!is_git_directory(git_dir)) {
1704 if (is_directory(git_dir))
1705 die(_("'%s' not recognized as a git repository"), git_dir);
Jens Lehmannee6fc512010-01-16 18:42:24 +01001706 strbuf_release(&buf);
1707 /* The submodule is not checked out, so it is not modified */
1708 return 0;
Jens Lehmannee6fc512010-01-16 18:42:24 +01001709 }
1710 strbuf_reset(&buf);
1711
Jeff Kingc972bf42020-07-28 16:25:12 -04001712 strvec_pushl(&cp.args, "status", "--porcelain=2", NULL);
Jens Lehmann3bfc4502010-03-13 23:00:27 +01001713 if (ignore_untracked)
Jeff Kingc972bf42020-07-28 16:25:12 -04001714 strvec_push(&cp.args, "-uno");
Jens Lehmann3bfc4502010-03-13 23:00:27 +01001715
Jeff Kingc12e8652016-04-28 09:39:15 -04001716 prepare_submodule_repo_env(&cp.env_array);
Jens Lehmannee6fc512010-01-16 18:42:24 +01001717 cp.git_cmd = 1;
1718 cp.no_stdin = 1;
1719 cp.out = -1;
Jens Lehmanneee49b62010-04-10 19:01:12 +02001720 cp.dir = path;
Jens Lehmannee6fc512010-01-16 18:42:24 +01001721 if (start_command(&cp))
Ralf Thielowa4ffbbb2020-01-15 19:07:01 +01001722 die(_("Could not run 'git status --porcelain=2' in submodule %s"), path);
Jens Lehmannee6fc512010-01-16 18:42:24 +01001723
Stefan Belleraf6865a2017-03-24 17:36:06 -07001724 fp = xfdopen(cp.out, "r");
1725 while (strbuf_getwholeline(&buf, fp, '\n') != EOF) {
Stefan Bellerfcecf0b2017-03-24 17:36:07 -07001726 /* regular untracked files */
1727 if (buf.buf[0] == '?')
Jens Lehmannc7e1a732010-03-04 22:20:33 +01001728 dirty_submodule |= DIRTY_SUBMODULE_UNTRACKED;
Jens Lehmannee6fc512010-01-16 18:42:24 +01001729
Stefan Beller40069d62017-03-29 15:26:16 -07001730 if (buf.buf[0] == 'u' ||
1731 buf.buf[0] == '1' ||
1732 buf.buf[0] == '2') {
1733 /* T = line type, XY = status, SSSS = submodule state */
1734 if (buf.len < strlen("T XY SSSS"))
Johannes Schindelin033abf92018-05-02 11:38:39 +02001735 BUG("invalid status --porcelain=2 line %s",
Stefan Beller40069d62017-03-29 15:26:16 -07001736 buf.buf);
1737
1738 if (buf.buf[5] == 'S' && buf.buf[8] == 'U')
1739 /* nested untracked file */
1740 dirty_submodule |= DIRTY_SUBMODULE_UNTRACKED;
1741
1742 if (buf.buf[0] == 'u' ||
1743 buf.buf[0] == '2' ||
1744 memcmp(buf.buf + 5, "S..U", 4))
1745 /* other change */
1746 dirty_submodule |= DIRTY_SUBMODULE_MODIFIED;
1747 }
Stefan Beller64f9a942017-03-24 17:36:05 -07001748
1749 if ((dirty_submodule & DIRTY_SUBMODULE_MODIFIED) &&
1750 ((dirty_submodule & DIRTY_SUBMODULE_UNTRACKED) ||
Stefan Belleraf6865a2017-03-24 17:36:06 -07001751 ignore_untracked)) {
1752 /*
1753 * We're not interested in any further information from
1754 * the child any more, neither output nor its exit code.
1755 */
1756 ignore_cp_exit_code = 1;
Stefan Beller64f9a942017-03-24 17:36:05 -07001757 break;
Stefan Belleraf6865a2017-03-24 17:36:06 -07001758 }
Jens Lehmannee6fc512010-01-16 18:42:24 +01001759 }
Stefan Belleraf6865a2017-03-24 17:36:06 -07001760 fclose(fp);
Jens Lehmannee6fc512010-01-16 18:42:24 +01001761
Stefan Belleraf6865a2017-03-24 17:36:06 -07001762 if (finish_command(&cp) && !ignore_cp_exit_code)
Ralf Thielowa4ffbbb2020-01-15 19:07:01 +01001763 die(_("'git status --porcelain=2' failed in submodule %s"), path);
Jens Lehmannee6fc512010-01-16 18:42:24 +01001764
Jens Lehmannee6fc512010-01-16 18:42:24 +01001765 strbuf_release(&buf);
Jens Lehmannc7e1a732010-03-04 22:20:33 +01001766 return dirty_submodule;
Jens Lehmannee6fc512010-01-16 18:42:24 +01001767}
Heiko Voigt68d03e42010-07-07 15:39:13 +02001768
Jens Lehmann293ab152012-09-26 20:21:13 +02001769int submodule_uses_gitfile(const char *path)
1770{
René Scharfed3180272014-08-19 21:09:35 +02001771 struct child_process cp = CHILD_PROCESS_INIT;
Jens Lehmann293ab152012-09-26 20:21:13 +02001772 struct strbuf buf = STRBUF_INIT;
1773 const char *git_dir;
1774
1775 strbuf_addf(&buf, "%s/.git", path);
1776 git_dir = read_gitfile(buf.buf);
1777 if (!git_dir) {
1778 strbuf_release(&buf);
1779 return 0;
1780 }
1781 strbuf_release(&buf);
1782
1783 /* Now test that all nested submodules use a gitfile too */
Junio C Hamanoafbdba32020-08-26 15:25:03 -07001784 strvec_pushl(&cp.args,
1785 "submodule", "foreach", "--quiet", "--recursive",
1786 "test -f .git", NULL);
1787
Jeff Kingc12e8652016-04-28 09:39:15 -04001788 prepare_submodule_repo_env(&cp.env_array);
Jens Lehmann293ab152012-09-26 20:21:13 +02001789 cp.git_cmd = 1;
1790 cp.no_stdin = 1;
1791 cp.no_stderr = 1;
1792 cp.no_stdout = 1;
1793 cp.dir = path;
1794 if (run_command(&cp))
1795 return 0;
1796
1797 return 1;
1798}
1799
Stefan Beller83b76962016-12-20 15:20:11 -08001800/*
1801 * Check if it is a bad idea to remove a submodule, i.e. if we'd lose data
1802 * when doing so.
1803 *
1804 * Return 1 if we'd lose data, return 0 if the removal is fine,
1805 * and negative values for errors.
1806 */
1807int bad_to_remove_submodule(const char *path, unsigned flags)
Jens Lehmann293ab152012-09-26 20:21:13 +02001808{
Jens Lehmann293ab152012-09-26 20:21:13 +02001809 ssize_t len;
René Scharfed3180272014-08-19 21:09:35 +02001810 struct child_process cp = CHILD_PROCESS_INIT;
Jens Lehmann293ab152012-09-26 20:21:13 +02001811 struct strbuf buf = STRBUF_INIT;
Stefan Beller83b76962016-12-20 15:20:11 -08001812 int ret = 0;
Jens Lehmann293ab152012-09-26 20:21:13 +02001813
René Scharfedbe44fa2015-05-19 23:44:23 +02001814 if (!file_exists(path) || is_empty_dir(path))
Jens Lehmann293ab152012-09-26 20:21:13 +02001815 return 0;
1816
Stefan Beller83b76962016-12-20 15:20:11 -08001817 if (!submodule_uses_gitfile(path))
1818 return 1;
1819
Jeff Kingc972bf42020-07-28 16:25:12 -04001820 strvec_pushl(&cp.args, "status", "--porcelain",
Jeff Kingf6d89422020-07-28 16:26:31 -04001821 "--ignore-submodules=none", NULL);
Stefan Beller83b76962016-12-20 15:20:11 -08001822
1823 if (flags & SUBMODULE_REMOVAL_IGNORE_UNTRACKED)
Jeff Kingc972bf42020-07-28 16:25:12 -04001824 strvec_push(&cp.args, "-uno");
Stefan Beller83b76962016-12-20 15:20:11 -08001825 else
Jeff Kingc972bf42020-07-28 16:25:12 -04001826 strvec_push(&cp.args, "-uall");
Stefan Beller83b76962016-12-20 15:20:11 -08001827
1828 if (!(flags & SUBMODULE_REMOVAL_IGNORE_IGNORED_UNTRACKED))
Jeff Kingc972bf42020-07-28 16:25:12 -04001829 strvec_push(&cp.args, "--ignored");
Stefan Beller83b76962016-12-20 15:20:11 -08001830
Jeff Kingc12e8652016-04-28 09:39:15 -04001831 prepare_submodule_repo_env(&cp.env_array);
Jens Lehmann293ab152012-09-26 20:21:13 +02001832 cp.git_cmd = 1;
1833 cp.no_stdin = 1;
1834 cp.out = -1;
1835 cp.dir = path;
Stefan Beller83b76962016-12-20 15:20:11 -08001836 if (start_command(&cp)) {
1837 if (flags & SUBMODULE_REMOVAL_DIE_ON_ERROR)
Ralf Thielow35ad44c2017-04-13 18:40:45 +02001838 die(_("could not start 'git status' in submodule '%s'"),
Stefan Beller83b76962016-12-20 15:20:11 -08001839 path);
1840 ret = -1;
1841 goto out;
1842 }
Jens Lehmann293ab152012-09-26 20:21:13 +02001843
1844 len = strbuf_read(&buf, cp.out, 1024);
1845 if (len > 2)
Stefan Beller83b76962016-12-20 15:20:11 -08001846 ret = 1;
Jens Lehmann293ab152012-09-26 20:21:13 +02001847 close(cp.out);
1848
Stefan Beller83b76962016-12-20 15:20:11 -08001849 if (finish_command(&cp)) {
1850 if (flags & SUBMODULE_REMOVAL_DIE_ON_ERROR)
Ralf Thielow35ad44c2017-04-13 18:40:45 +02001851 die(_("could not run 'git status' in submodule '%s'"),
Stefan Beller83b76962016-12-20 15:20:11 -08001852 path);
1853 ret = -1;
1854 }
1855out:
Jens Lehmann293ab152012-09-26 20:21:13 +02001856 strbuf_release(&buf);
Stefan Beller83b76962016-12-20 15:20:11 -08001857 return ret;
Jens Lehmann293ab152012-09-26 20:21:13 +02001858}
1859
Stefan Beller898c2e62018-12-14 15:59:43 -08001860void submodule_unset_core_worktree(const struct submodule *sub)
1861{
Jonathan Tance125d42021-09-15 11:59:19 -07001862 struct strbuf config_path = STRBUF_INIT;
Stefan Beller898c2e62018-12-14 15:59:43 -08001863
Jonathan Tance125d42021-09-15 11:59:19 -07001864 submodule_name_to_gitdir(&config_path, the_repository, sub->name);
1865 strbuf_addstr(&config_path, "/config");
1866
1867 if (git_config_set_in_file_gently(config_path.buf, "core.worktree", NULL))
Stefan Beller898c2e62018-12-14 15:59:43 -08001868 warning(_("Could not unset core.worktree setting in submodule '%s'"),
1869 sub->path);
1870
Jonathan Tance125d42021-09-15 11:59:19 -07001871 strbuf_release(&config_path);
Stefan Beller898c2e62018-12-14 15:59:43 -08001872}
1873
Stefan Beller202275b2017-03-14 14:46:36 -07001874static const char *get_super_prefix_or_empty(void)
1875{
1876 const char *s = get_super_prefix();
1877 if (!s)
1878 s = "";
1879 return s;
1880}
1881
Stefan Beller6e3c1592017-03-14 14:46:37 -07001882static int submodule_has_dirty_index(const struct submodule *sub)
1883{
1884 struct child_process cp = CHILD_PROCESS_INIT;
1885
Stefan Bellerda27bc82017-05-02 12:32:13 -07001886 prepare_submodule_repo_env(&cp.env_array);
Stefan Beller6e3c1592017-03-14 14:46:37 -07001887
1888 cp.git_cmd = 1;
Jeff Kingc972bf42020-07-28 16:25:12 -04001889 strvec_pushl(&cp.args, "diff-index", "--quiet",
Jeff Kingf6d89422020-07-28 16:26:31 -04001890 "--cached", "HEAD", NULL);
Stefan Beller6e3c1592017-03-14 14:46:37 -07001891 cp.no_stdin = 1;
1892 cp.no_stdout = 1;
1893 cp.dir = sub->path;
1894 if (start_command(&cp))
Ralf Thielowa4ffbbb2020-01-15 19:07:01 +01001895 die(_("could not recurse into submodule '%s'"), sub->path);
Stefan Beller6e3c1592017-03-14 14:46:37 -07001896
1897 return finish_command(&cp);
1898}
1899
1900static void submodule_reset_index(const char *path)
1901{
1902 struct child_process cp = CHILD_PROCESS_INIT;
Stefan Bellerda27bc82017-05-02 12:32:13 -07001903 prepare_submodule_repo_env(&cp.env_array);
Stefan Beller6e3c1592017-03-14 14:46:37 -07001904
1905 cp.git_cmd = 1;
1906 cp.no_stdin = 1;
1907 cp.dir = path;
1908
Jeff Kingc972bf42020-07-28 16:25:12 -04001909 strvec_pushf(&cp.args, "--super-prefix=%s%s/",
Jeff Kingf6d89422020-07-28 16:26:31 -04001910 get_super_prefix_or_empty(), path);
Jeff Kingc972bf42020-07-28 16:25:12 -04001911 strvec_pushl(&cp.args, "read-tree", "-u", "--reset", NULL);
Stefan Beller6e3c1592017-03-14 14:46:37 -07001912
Jeff Kingc972bf42020-07-28 16:25:12 -04001913 strvec_push(&cp.args, empty_tree_oid_hex());
Stefan Beller6e3c1592017-03-14 14:46:37 -07001914
1915 if (run_command(&cp))
Ralf Thielowa4ffbbb2020-01-15 19:07:01 +01001916 die(_("could not reset submodule index"));
Stefan Beller6e3c1592017-03-14 14:46:37 -07001917}
1918
1919/**
1920 * Moves a submodule at a given path from a given head to another new head.
1921 * For edge cases (a submodule coming into existence or removing a submodule)
1922 * pass NULL for old or new respectively.
1923 */
1924int submodule_move_head(const char *path,
Brandon Williamsbc099912018-02-14 10:59:49 -08001925 const char *old_head,
1926 const char *new_head,
Stefan Beller6e3c1592017-03-14 14:46:37 -07001927 unsigned flags)
1928{
1929 int ret = 0;
1930 struct child_process cp = CHILD_PROCESS_INIT;
1931 const struct submodule *sub;
Stefan Bellerf2d48992017-04-18 14:37:24 -07001932 int *error_code_ptr, error_code;
Stefan Beller6e3c1592017-03-14 14:46:37 -07001933
Brandon Williams627d9342017-06-22 11:43:46 -07001934 if (!is_submodule_active(the_repository, path))
Stefan Beller823bab02017-04-18 14:37:23 -07001935 return 0;
1936
Stefan Bellerf2d48992017-04-18 14:37:24 -07001937 if (flags & SUBMODULE_MOVE_HEAD_FORCE)
1938 /*
1939 * Pass non NULL pointer to is_submodule_populated_gently
1940 * to prevent die()-ing. We'll use connect_work_tree_and_git_dir
1941 * to fixup the submodule in the force case later.
1942 */
1943 error_code_ptr = &error_code;
1944 else
1945 error_code_ptr = NULL;
1946
Brandon Williamsbc099912018-02-14 10:59:49 -08001947 if (old_head && !is_submodule_populated_gently(path, error_code_ptr))
Stefan Bellerf2d48992017-04-18 14:37:24 -07001948 return 0;
Stefan Beller6e3c1592017-03-14 14:46:37 -07001949
brian m. carlson14228442021-04-26 01:02:56 +00001950 sub = submodule_from_path(the_repository, null_oid(), path);
Stefan Beller6e3c1592017-03-14 14:46:37 -07001951
1952 if (!sub)
Johannes Schindelin033abf92018-05-02 11:38:39 +02001953 BUG("could not get submodule information for '%s'", path);
Stefan Beller6e3c1592017-03-14 14:46:37 -07001954
Brandon Williamsbc099912018-02-14 10:59:49 -08001955 if (old_head && !(flags & SUBMODULE_MOVE_HEAD_FORCE)) {
Stefan Beller6e3c1592017-03-14 14:46:37 -07001956 /* Check if the submodule has a dirty index. */
1957 if (submodule_has_dirty_index(sub))
1958 return error(_("submodule '%s' has dirty index"), path);
1959 }
1960
1961 if (!(flags & SUBMODULE_MOVE_HEAD_DRY_RUN)) {
Brandon Williamsbc099912018-02-14 10:59:49 -08001962 if (old_head) {
Stefan Beller6e3c1592017-03-14 14:46:37 -07001963 if (!submodule_uses_gitfile(path))
Jeff Kingcf7a9012019-05-09 17:27:31 -04001964 absorb_git_dir_into_superproject(path,
Stefan Beller6e3c1592017-03-14 14:46:37 -07001965 ABSORB_GITDIR_RECURSE_SUBMODULES);
1966 } else {
Jonathan Tance125d42021-09-15 11:59:19 -07001967 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, 0);
1971 strbuf_release(&gitdir);
Stefan Beller6e3c1592017-03-14 14:46:37 -07001972
1973 /* make sure the index is clean as well */
1974 submodule_reset_index(path);
1975 }
Stefan Bellerf2d48992017-04-18 14:37:24 -07001976
Brandon Williamsbc099912018-02-14 10:59:49 -08001977 if (old_head && (flags & SUBMODULE_MOVE_HEAD_FORCE)) {
Jonathan Tance125d42021-09-15 11:59:19 -07001978 struct strbuf gitdir = STRBUF_INIT;
1979 submodule_name_to_gitdir(&gitdir, the_repository,
1980 sub->name);
1981 connect_work_tree_and_git_dir(path, gitdir.buf, 1);
1982 strbuf_release(&gitdir);
Stefan Bellerf2d48992017-04-18 14:37:24 -07001983 }
Stefan Beller6e3c1592017-03-14 14:46:37 -07001984 }
1985
Stefan Bellerda27bc82017-05-02 12:32:13 -07001986 prepare_submodule_repo_env(&cp.env_array);
Stefan Beller6e3c1592017-03-14 14:46:37 -07001987
1988 cp.git_cmd = 1;
1989 cp.no_stdin = 1;
1990 cp.dir = path;
1991
Jeff Kingc972bf42020-07-28 16:25:12 -04001992 strvec_pushf(&cp.args, "--super-prefix=%s%s/",
Jeff Kingf6d89422020-07-28 16:26:31 -04001993 get_super_prefix_or_empty(), path);
Jeff Kingc972bf42020-07-28 16:25:12 -04001994 strvec_pushl(&cp.args, "read-tree", "--recurse-submodules", NULL);
Stefan Beller6e3c1592017-03-14 14:46:37 -07001995
1996 if (flags & SUBMODULE_MOVE_HEAD_DRY_RUN)
Jeff Kingc972bf42020-07-28 16:25:12 -04001997 strvec_push(&cp.args, "-n");
Stefan Beller6e3c1592017-03-14 14:46:37 -07001998 else
Jeff Kingc972bf42020-07-28 16:25:12 -04001999 strvec_push(&cp.args, "-u");
Stefan Beller6e3c1592017-03-14 14:46:37 -07002000
2001 if (flags & SUBMODULE_MOVE_HEAD_FORCE)
Jeff Kingc972bf42020-07-28 16:25:12 -04002002 strvec_push(&cp.args, "--reset");
Stefan Beller6e3c1592017-03-14 14:46:37 -07002003 else
Jeff Kingc972bf42020-07-28 16:25:12 -04002004 strvec_push(&cp.args, "-m");
Stefan Beller6e3c1592017-03-14 14:46:37 -07002005
Stefan Beller7dcc1f42018-01-05 12:03:04 -08002006 if (!(flags & SUBMODULE_MOVE_HEAD_FORCE))
Jeff Kingc972bf42020-07-28 16:25:12 -04002007 strvec_push(&cp.args, old_head ? old_head : empty_tree_oid_hex());
Stefan Beller7dcc1f42018-01-05 12:03:04 -08002008
Jeff Kingc972bf42020-07-28 16:25:12 -04002009 strvec_push(&cp.args, new_head ? new_head : empty_tree_oid_hex());
Stefan Beller6e3c1592017-03-14 14:46:37 -07002010
2011 if (run_command(&cp)) {
Stefan Bellerba95d4e2018-06-20 15:32:53 -07002012 ret = error(_("Submodule '%s' could not be updated."), path);
Stefan Beller6e3c1592017-03-14 14:46:37 -07002013 goto out;
2014 }
2015
2016 if (!(flags & SUBMODULE_MOVE_HEAD_DRY_RUN)) {
Brandon Williamsbc099912018-02-14 10:59:49 -08002017 if (new_head) {
Stefan Bellera17062c2017-05-02 12:32:12 -07002018 child_process_init(&cp);
Stefan Beller6e3c1592017-03-14 14:46:37 -07002019 /* also set the HEAD accordingly */
Stefan Bellera17062c2017-05-02 12:32:12 -07002020 cp.git_cmd = 1;
2021 cp.no_stdin = 1;
2022 cp.dir = path;
Stefan Beller6e3c1592017-03-14 14:46:37 -07002023
Stefan Beller218c8832017-05-02 12:32:14 -07002024 prepare_submodule_repo_env(&cp.env_array);
Jeff Kingc972bf42020-07-28 16:25:12 -04002025 strvec_pushl(&cp.args, "update-ref", "HEAD",
Jeff Kingf6d89422020-07-28 16:26:31 -04002026 "--no-deref", new_head, NULL);
Stefan Beller6e3c1592017-03-14 14:46:37 -07002027
Stefan Bellera17062c2017-05-02 12:32:12 -07002028 if (run_command(&cp)) {
Stefan Beller6e3c1592017-03-14 14:46:37 -07002029 ret = -1;
2030 goto out;
2031 }
2032 } else {
2033 struct strbuf sb = STRBUF_INIT;
2034
2035 strbuf_addf(&sb, "%s/.git", path);
2036 unlink_or_warn(sb.buf);
2037 strbuf_release(&sb);
2038
2039 if (is_empty_dir(path))
2040 rmdir_or_warn(path);
Stefan Beller898c2e62018-12-14 15:59:43 -08002041
2042 submodule_unset_core_worktree(sub);
Stefan Beller6e3c1592017-03-14 14:46:37 -07002043 }
2044 }
2045out:
2046 return ret;
2047}
2048
Johannes Schindelina8dee3c2019-10-01 23:27:18 +02002049int validate_submodule_git_dir(char *git_dir, const char *submodule_name)
2050{
2051 size_t len = strlen(git_dir), suffix_len = strlen(submodule_name);
2052 char *p;
2053 int ret = 0;
2054
2055 if (len <= suffix_len || (p = git_dir + len - suffix_len)[-1] != '/' ||
2056 strcmp(p, submodule_name))
2057 BUG("submodule name '%s' not a suffix of git dir '%s'",
2058 submodule_name, git_dir);
2059
2060 /*
2061 * We prevent the contents of sibling submodules' git directories to
2062 * clash.
2063 *
2064 * Example: having a submodule named `hippo` and another one named
2065 * `hippo/hooks` would result in the git directories
2066 * `.git/modules/hippo/` and `.git/modules/hippo/hooks/`, respectively,
2067 * but the latter directory is already designated to contain the hooks
2068 * of the former.
2069 */
2070 for (; *p; p++) {
2071 if (is_dir_sep(*p)) {
2072 char c = *p;
2073
2074 *p = '\0';
2075 if (is_git_directory(git_dir))
2076 ret = -1;
2077 *p = c;
2078
2079 if (ret < 0)
2080 return error(_("submodule git dir '%s' is "
2081 "inside git dir '%.*s'"),
2082 git_dir,
2083 (int)(p - git_dir), git_dir);
2084 }
2085 }
2086
2087 return 0;
2088}
2089
Stefan Bellerf6f85862016-12-12 11:04:35 -08002090/*
2091 * Embeds a single submodules git directory into the superprojects git dir,
2092 * non recursively.
2093 */
Jeff Kingcf7a9012019-05-09 17:27:31 -04002094static void relocate_single_git_dir_into_superproject(const char *path)
Stefan Bellerf6f85862016-12-12 11:04:35 -08002095{
2096 char *old_git_dir = NULL, *real_old_git_dir = NULL, *real_new_git_dir = NULL;
Jonathan Tance125d42021-09-15 11:59:19 -07002097 struct strbuf new_gitdir = STRBUF_INIT;
Stefan Bellerf6f85862016-12-12 11:04:35 -08002098 const struct submodule *sub;
2099
2100 if (submodule_uses_worktrees(path))
2101 die(_("relocate_gitdir for submodule '%s' with "
2102 "more than one worktree not supported"), path);
2103
2104 old_git_dir = xstrfmt("%s/.git", path);
2105 if (read_gitfile(old_git_dir))
2106 /* If it is an actual gitfile, it doesn't need migration. */
2107 return;
2108
Johannes Schindelince83ead2017-03-08 16:43:40 +01002109 real_old_git_dir = real_pathdup(old_git_dir, 1);
Stefan Bellerf6f85862016-12-12 11:04:35 -08002110
brian m. carlson14228442021-04-26 01:02:56 +00002111 sub = submodule_from_path(the_repository, null_oid(), path);
Stefan Bellerf6f85862016-12-12 11:04:35 -08002112 if (!sub)
2113 die(_("could not lookup name for submodule '%s'"), path);
2114
Jonathan Tance125d42021-09-15 11:59:19 -07002115 submodule_name_to_gitdir(&new_gitdir, the_repository, sub->name);
2116 if (validate_submodule_git_dir(new_gitdir.buf, sub->name) < 0)
Johannes Schindelina8dee3c2019-10-01 23:27:18 +02002117 die(_("refusing to move '%s' into an existing git dir"),
2118 real_old_git_dir);
Jonathan Tance125d42021-09-15 11:59:19 -07002119 if (safe_create_leading_directories_const(new_gitdir.buf) < 0)
2120 die(_("could not create directory '%s'"), new_gitdir.buf);
2121 real_new_git_dir = real_pathdup(new_gitdir.buf, 1);
Stefan Bellerf6f85862016-12-12 11:04:35 -08002122
Stefan Bellerf6f85862016-12-12 11:04:35 -08002123 fprintf(stderr, _("Migrating git directory of '%s%s' from\n'%s' to\n'%s'\n"),
Stefan Beller202275b2017-03-14 14:46:36 -07002124 get_super_prefix_or_empty(), path,
Stefan Bellerf6f85862016-12-12 11:04:35 -08002125 real_old_git_dir, real_new_git_dir);
2126
2127 relocate_gitdir(path, real_old_git_dir, real_new_git_dir);
2128
2129 free(old_git_dir);
2130 free(real_old_git_dir);
2131 free(real_new_git_dir);
Jonathan Tance125d42021-09-15 11:59:19 -07002132 strbuf_release(&new_gitdir);
Stefan Bellerf6f85862016-12-12 11:04:35 -08002133}
2134
2135/*
2136 * Migrate the git directory of the submodule given by path from
2137 * having its git directory within the working tree to the git dir nested
2138 * in its superprojects git dir under modules/.
2139 */
Jeff Kingcf7a9012019-05-09 17:27:31 -04002140void absorb_git_dir_into_superproject(const char *path,
Stefan Bellerf6f85862016-12-12 11:04:35 -08002141 unsigned flags)
2142{
Stefan Bellerec9629b2017-01-25 15:04:50 -08002143 int err_code;
2144 const char *sub_git_dir;
Stefan Bellerf6f85862016-12-12 11:04:35 -08002145 struct strbuf gitdir = STRBUF_INIT;
Stefan Bellerf6f85862016-12-12 11:04:35 -08002146 strbuf_addf(&gitdir, "%s/.git", path);
Stefan Bellerec9629b2017-01-25 15:04:50 -08002147 sub_git_dir = resolve_gitdir_gently(gitdir.buf, &err_code);
Stefan Bellerf6f85862016-12-12 11:04:35 -08002148
2149 /* Not populated? */
Stefan Bellerec9629b2017-01-25 15:04:50 -08002150 if (!sub_git_dir) {
Stefan Bellerec9629b2017-01-25 15:04:50 -08002151 const struct submodule *sub;
Jonathan Tance125d42021-09-15 11:59:19 -07002152 struct strbuf sub_gitdir = STRBUF_INIT;
Stefan Bellerf6f85862016-12-12 11:04:35 -08002153
Stefan Bellerec9629b2017-01-25 15:04:50 -08002154 if (err_code == READ_GITFILE_ERR_STAT_FAILED) {
2155 /* unpopulated as expected */
2156 strbuf_release(&gitdir);
2157 return;
2158 }
2159
2160 if (err_code != READ_GITFILE_ERR_NOT_A_REPO)
2161 /* We don't know what broke here. */
2162 read_gitfile_error_die(err_code, path, NULL);
2163
2164 /*
2165 * Maybe populated, but no git directory was found?
2166 * This can happen if the superproject is a submodule
2167 * itself and was just absorbed. The absorption of the
2168 * superproject did not rewrite the git file links yet,
2169 * fix it now.
2170 */
brian m. carlson14228442021-04-26 01:02:56 +00002171 sub = submodule_from_path(the_repository, null_oid(), path);
Stefan Bellerec9629b2017-01-25 15:04:50 -08002172 if (!sub)
2173 die(_("could not lookup name for submodule '%s'"), path);
Jonathan Tance125d42021-09-15 11:59:19 -07002174 submodule_name_to_gitdir(&sub_gitdir, the_repository, sub->name);
2175 connect_work_tree_and_git_dir(path, sub_gitdir.buf, 0);
2176 strbuf_release(&sub_gitdir);
Stefan Bellerec9629b2017-01-25 15:04:50 -08002177 } else {
2178 /* Is it already absorbed into the superprojects git dir? */
Johannes Schindelince83ead2017-03-08 16:43:40 +01002179 char *real_sub_git_dir = real_pathdup(sub_git_dir, 1);
2180 char *real_common_git_dir = real_pathdup(get_git_common_dir(), 1);
Stefan Bellerec9629b2017-01-25 15:04:50 -08002181
2182 if (!starts_with(real_sub_git_dir, real_common_git_dir))
Jeff Kingcf7a9012019-05-09 17:27:31 -04002183 relocate_single_git_dir_into_superproject(path);
Stefan Bellerec9629b2017-01-25 15:04:50 -08002184
2185 free(real_sub_git_dir);
2186 free(real_common_git_dir);
2187 }
2188 strbuf_release(&gitdir);
Stefan Bellerf6f85862016-12-12 11:04:35 -08002189
2190 if (flags & ABSORB_GITDIR_RECURSE_SUBMODULES) {
2191 struct child_process cp = CHILD_PROCESS_INIT;
2192 struct strbuf sb = STRBUF_INIT;
2193
2194 if (flags & ~ABSORB_GITDIR_RECURSE_SUBMODULES)
Johannes Schindelin033abf92018-05-02 11:38:39 +02002195 BUG("we don't know how to pass the flags down?");
Stefan Bellerf6f85862016-12-12 11:04:35 -08002196
Stefan Beller202275b2017-03-14 14:46:36 -07002197 strbuf_addstr(&sb, get_super_prefix_or_empty());
Stefan Bellerf6f85862016-12-12 11:04:35 -08002198 strbuf_addstr(&sb, path);
2199 strbuf_addch(&sb, '/');
2200
2201 cp.dir = path;
2202 cp.git_cmd = 1;
2203 cp.no_stdin = 1;
Jeff Kingc972bf42020-07-28 16:25:12 -04002204 strvec_pushl(&cp.args, "--super-prefix", sb.buf,
Jeff Kingf6d89422020-07-28 16:26:31 -04002205 "submodule--helper",
2206 "absorb-git-dirs", NULL);
Stefan Bellerf6f85862016-12-12 11:04:35 -08002207 prepare_submodule_repo_env(&cp.env_array);
2208 if (run_command(&cp))
2209 die(_("could not recurse into submodule '%s'"), path);
2210
2211 strbuf_release(&sb);
2212 }
Stefan Bellerf6f85862016-12-12 11:04:35 -08002213}
Stefan Bellerbf0231c2017-03-08 15:07:42 -08002214
Alexandr Miloslavskiy49d3c4b2020-03-10 13:11:24 +00002215int get_superproject_working_tree(struct strbuf *buf)
Stefan Bellerbf0231c2017-03-08 15:07:42 -08002216{
2217 struct child_process cp = CHILD_PROCESS_INIT;
2218 struct strbuf sb = STRBUF_INIT;
Alexandr Miloslavskiy4530a852020-03-10 13:11:23 +00002219 struct strbuf one_up = STRBUF_INIT;
Stefan Bellerbf0231c2017-03-08 15:07:42 -08002220 const char *cwd = xgetcwd();
Alexandr Miloslavskiy49d3c4b2020-03-10 13:11:24 +00002221 int ret = 0;
Stefan Bellerbf0231c2017-03-08 15:07:42 -08002222 const char *subpath;
2223 int code;
2224 ssize_t len;
2225
2226 if (!is_inside_work_tree())
2227 /*
2228 * FIXME:
2229 * We might have a superproject, but it is harder
2230 * to determine.
2231 */
Alexandr Miloslavskiy49d3c4b2020-03-10 13:11:24 +00002232 return 0;
Stefan Bellerbf0231c2017-03-08 15:07:42 -08002233
Alexandr Miloslavskiy4530a852020-03-10 13:11:23 +00002234 if (!strbuf_realpath(&one_up, "../", 0))
Alexandr Miloslavskiy49d3c4b2020-03-10 13:11:24 +00002235 return 0;
Stefan Bellerbf0231c2017-03-08 15:07:42 -08002236
Alexandr Miloslavskiy4530a852020-03-10 13:11:23 +00002237 subpath = relative_path(cwd, one_up.buf, &sb);
2238 strbuf_release(&one_up);
Stefan Bellerbf0231c2017-03-08 15:07:42 -08002239
2240 prepare_submodule_repo_env(&cp.env_array);
Jeff Kingc972bf42020-07-28 16:25:12 -04002241 strvec_pop(&cp.env_array);
Stefan Bellerbf0231c2017-03-08 15:07:42 -08002242
Jeff Kingc972bf42020-07-28 16:25:12 -04002243 strvec_pushl(&cp.args, "--literal-pathspecs", "-C", "..",
Jeff Kingf6d89422020-07-28 16:26:31 -04002244 "ls-files", "-z", "--stage", "--full-name", "--",
2245 subpath, NULL);
Stefan Bellerbf0231c2017-03-08 15:07:42 -08002246 strbuf_reset(&sb);
2247
2248 cp.no_stdin = 1;
2249 cp.no_stderr = 1;
2250 cp.out = -1;
2251 cp.git_cmd = 1;
2252
2253 if (start_command(&cp))
2254 die(_("could not start ls-files in .."));
2255
2256 len = strbuf_read(&sb, cp.out, PATH_MAX);
2257 close(cp.out);
2258
2259 if (starts_with(sb.buf, "160000")) {
2260 int super_sub_len;
2261 int cwd_len = strlen(cwd);
2262 char *super_sub, *super_wt;
2263
2264 /*
2265 * There is a superproject having this repo as a submodule.
2266 * The format is <mode> SP <hash> SP <stage> TAB <full name> \0,
2267 * We're only interested in the name after the tab.
2268 */
2269 super_sub = strchr(sb.buf, '\t') + 1;
Sam McKelviec5cbb272018-09-27 11:10:54 -07002270 super_sub_len = strlen(super_sub);
Stefan Bellerbf0231c2017-03-08 15:07:42 -08002271
2272 if (super_sub_len > cwd_len ||
2273 strcmp(&cwd[cwd_len - super_sub_len], super_sub))
Johannes Schindelinc3c34862018-05-02 11:38:41 +02002274 BUG("returned path string doesn't match cwd?");
Stefan Bellerbf0231c2017-03-08 15:07:42 -08002275
2276 super_wt = xstrdup(cwd);
2277 super_wt[cwd_len - super_sub_len] = '\0';
2278
Alexandr Miloslavskiy49d3c4b2020-03-10 13:11:24 +00002279 strbuf_realpath(buf, super_wt, 1);
2280 ret = 1;
Stefan Bellerbf0231c2017-03-08 15:07:42 -08002281 free(super_wt);
2282 }
2283 strbuf_release(&sb);
2284
2285 code = finish_command(&cp);
2286
2287 if (code == 128)
2288 /* '../' is not a git repository */
Alexandr Miloslavskiy49d3c4b2020-03-10 13:11:24 +00002289 return 0;
Stefan Bellerbf0231c2017-03-08 15:07:42 -08002290 if (code == 0 && len == 0)
2291 /* There is an unrelated git repository at '../' */
Alexandr Miloslavskiy49d3c4b2020-03-10 13:11:24 +00002292 return 0;
Stefan Bellerbf0231c2017-03-08 15:07:42 -08002293 if (code)
2294 die(_("ls-tree returned unexpected return code %d"), code);
2295
2296 return ret;
2297}
Nguyễn Thái Ngọc Duybbbb7de2017-03-26 09:42:30 +07002298
Han-Wen Nienhuys3ce08542017-09-25 17:59:26 +02002299/*
2300 * Put the gitdir for a submodule (given relative to the main
2301 * repository worktree) into `buf`, or return -1 on error.
2302 */
Nguyễn Thái Ngọc Duybbbb7de2017-03-26 09:42:30 +07002303int submodule_to_gitdir(struct strbuf *buf, const char *submodule)
2304{
2305 const struct submodule *sub;
2306 const char *git_dir;
2307 int ret = 0;
2308
2309 strbuf_reset(buf);
2310 strbuf_addstr(buf, submodule);
2311 strbuf_complete(buf, '/');
2312 strbuf_addstr(buf, ".git");
2313
2314 git_dir = read_gitfile(buf->buf);
2315 if (git_dir) {
2316 strbuf_reset(buf);
2317 strbuf_addstr(buf, git_dir);
2318 }
2319 if (!is_git_directory(buf->buf)) {
brian m. carlson14228442021-04-26 01:02:56 +00002320 sub = submodule_from_path(the_repository, null_oid(),
2321 submodule);
Nguyễn Thái Ngọc Duybbbb7de2017-03-26 09:42:30 +07002322 if (!sub) {
2323 ret = -1;
2324 goto cleanup;
2325 }
2326 strbuf_reset(buf);
Jonathan Tance125d42021-09-15 11:59:19 -07002327 submodule_name_to_gitdir(buf, the_repository, sub->name);
Nguyễn Thái Ngọc Duybbbb7de2017-03-26 09:42:30 +07002328 }
2329
2330cleanup:
2331 return ret;
2332}
Jonathan Tance125d42021-09-15 11:59:19 -07002333
2334void submodule_name_to_gitdir(struct strbuf *buf, struct repository *r,
2335 const char *submodule_name)
2336{
2337 /*
2338 * NEEDSWORK: The current way of mapping a submodule's name to
2339 * its location in .git/modules/ has problems with some naming
2340 * schemes. For example, if a submodule is named "foo" and
2341 * another is named "foo/bar" (whether present in the same
2342 * superproject commit or not - the problem will arise if both
2343 * superproject commits have been checked out at any point in
2344 * time), or if two submodule names only have different cases in
2345 * a case-insensitive filesystem.
2346 *
2347 * There are several solutions, including encoding the path in
2348 * some way, introducing a submodule.<name>.gitdir config in
2349 * .git/config (not .gitmodules) that allows overriding what the
2350 * gitdir of a submodule would be (and teach Git, upon noticing
2351 * a clash, to automatically determine a non-clashing name and
2352 * to write such a config), or introducing a
2353 * submodule.<name>.gitdir config in .gitmodules that repo
2354 * administrators can explicitly set. Nothing has been decided,
2355 * so for now, just append the name at the end of the path.
2356 */
2357 strbuf_repo_git_path(buf, r, "modules/");
2358 strbuf_addstr(buf, submodule_name);
2359}