merge(3p/git): Merge git upstream at v2.26.2
This commit is contained in:
Vincent Ambo
commit
5229c9b232
1006 changed files with 149006 additions and 60819 deletions
106
third_party/git/submodule.c
vendored
106
third_party/git/submodule.c
vendored
|
|
@ -82,7 +82,7 @@ int is_staging_gitmodules_ok(struct index_state *istate)
|
|||
if ((pos >= 0) && (pos < istate->cache_nr)) {
|
||||
struct stat st;
|
||||
if (lstat(GITMODULES_FILE, &st) == 0 &&
|
||||
ie_match_stat(istate, istate->cache[pos], &st, 0) & DATA_CHANGED)
|
||||
ie_modified(istate, istate->cache[pos], &st, 0) & DATA_CHANGED)
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -431,7 +431,7 @@ void handle_ignore_submodules_arg(struct diff_options *diffopt,
|
|||
else if (!strcmp(arg, "dirty"))
|
||||
diffopt->flags.ignore_dirty_submodules = 1;
|
||||
else if (strcmp(arg, "none"))
|
||||
die("bad --ignore-submodules argument: %s", arg);
|
||||
die(_("bad --ignore-submodules argument: %s"), arg);
|
||||
/*
|
||||
* Please update _git_status() in git-completion.bash when you
|
||||
* add new options
|
||||
|
|
@ -812,9 +812,9 @@ static void collect_changed_submodules_cb(struct diff_queue_struct *q,
|
|||
submodule = submodule_from_name(me->repo,
|
||||
commit_oid, name);
|
||||
if (submodule) {
|
||||
warning("Submodule in commit %s at path: "
|
||||
warning(_("Submodule in commit %s at path: "
|
||||
"'%s' collides with a submodule named "
|
||||
"the same. Skipping it.",
|
||||
"the same. Skipping it."),
|
||||
oid_to_hex(commit_oid), p->two->path);
|
||||
name = NULL;
|
||||
}
|
||||
|
|
@ -844,7 +844,7 @@ static void collect_changed_submodules(struct repository *r,
|
|||
repo_init_revisions(r, &rev, NULL);
|
||||
setup_revisions(argv->argc, argv->argv, &rev, NULL);
|
||||
if (prepare_revision_walk(&rev))
|
||||
die("revision walk setup failed");
|
||||
die(_("revision walk setup failed"));
|
||||
|
||||
while ((commit = get_revision(&rev))) {
|
||||
struct rev_info diff_rev;
|
||||
|
|
@ -992,7 +992,7 @@ static int submodule_needs_pushing(struct repository *r,
|
|||
cp.out = -1;
|
||||
cp.dir = path;
|
||||
if (start_command(&cp))
|
||||
die("Could not run 'git rev-list <commits> --not --remotes -n 1' command in submodule %s",
|
||||
die(_("Could not run 'git rev-list <commits> --not --remotes -n 1' command in submodule %s"),
|
||||
path);
|
||||
if (strbuf_read(&buf, cp.out, the_hash_algo->hexsz + 1))
|
||||
needs_pushing = 1;
|
||||
|
|
@ -1115,7 +1115,7 @@ static void submodule_push_check(const char *path, const char *head,
|
|||
* child process.
|
||||
*/
|
||||
if (run_command(&cp))
|
||||
die("process for submodule '%s' failed", path);
|
||||
die(_("process for submodule '%s' failed"), path);
|
||||
}
|
||||
|
||||
int push_unpushed_submodules(struct repository *r,
|
||||
|
|
@ -1155,10 +1155,10 @@ int push_unpushed_submodules(struct repository *r,
|
|||
/* Actually push the submodules */
|
||||
for (i = 0; i < needs_pushing.nr; i++) {
|
||||
const char *path = needs_pushing.items[i].string;
|
||||
fprintf(stderr, "Pushing submodule '%s'\n", path);
|
||||
fprintf(stderr, _("Pushing submodule '%s'\n"), path);
|
||||
if (!push_submodule(path, remote, rs,
|
||||
push_options, dry_run)) {
|
||||
fprintf(stderr, "Unable to push submodule '%s'\n", path);
|
||||
fprintf(stderr, _("Unable to push submodule '%s'\n"), path);
|
||||
ret = 0;
|
||||
}
|
||||
}
|
||||
|
|
@ -1280,10 +1280,12 @@ struct submodule_parallel_fetch {
|
|||
/* Pending fetches by OIDs */
|
||||
struct fetch_task **oid_fetch_tasks;
|
||||
int oid_fetch_tasks_nr, oid_fetch_tasks_alloc;
|
||||
|
||||
struct strbuf submodules_with_errors;
|
||||
};
|
||||
#define SPF_INIT {0, ARGV_ARRAY_INIT, NULL, NULL, 0, 0, 0, 0, \
|
||||
STRING_LIST_INIT_DUP, \
|
||||
NULL, 0, 0}
|
||||
NULL, 0, 0, STRBUF_INIT}
|
||||
|
||||
static int get_fetch_recurse_config(const struct submodule *submodule,
|
||||
struct submodule_parallel_fetch *spf)
|
||||
|
|
@ -1448,7 +1450,7 @@ static int get_next_submodule(struct child_process *cp,
|
|||
prepare_submodule_repo_env_in_gitdir(&cp->env_array);
|
||||
cp->git_cmd = 1;
|
||||
if (!spf->quiet)
|
||||
strbuf_addf(err, "Fetching submodule %s%s\n",
|
||||
strbuf_addf(err, _("Fetching submodule %s%s\n"),
|
||||
spf->prefix, ce->name);
|
||||
argv_array_init(&cp->args);
|
||||
argv_array_pushv(&cp->args, spf->args.argv);
|
||||
|
|
@ -1478,7 +1480,7 @@ static int get_next_submodule(struct child_process *cp,
|
|||
!is_empty_dir(ce->name)) {
|
||||
spf->result = 1;
|
||||
strbuf_addf(err,
|
||||
_("Could not access submodule '%s'"),
|
||||
_("Could not access submodule '%s'\n"),
|
||||
ce->name);
|
||||
}
|
||||
}
|
||||
|
|
@ -1547,7 +1549,10 @@ static int fetch_finish(int retvalue, struct strbuf *err,
|
|||
struct string_list_item *it;
|
||||
struct oid_array *commits;
|
||||
|
||||
if (retvalue)
|
||||
if (!task || !task->sub)
|
||||
BUG("callback cookie bogus");
|
||||
|
||||
if (retvalue) {
|
||||
/*
|
||||
* NEEDSWORK: This indicates that the overall fetch
|
||||
* failed, even though there may be a subsequent fetch
|
||||
|
|
@ -1557,8 +1562,9 @@ static int fetch_finish(int retvalue, struct strbuf *err,
|
|||
*/
|
||||
spf->result = 1;
|
||||
|
||||
if (!task || !task->sub)
|
||||
BUG("callback cookie bogus");
|
||||
strbuf_addf(&spf->submodules_with_errors, "\t%s\n",
|
||||
task->sub->name);
|
||||
}
|
||||
|
||||
/* Is this the second time we process this submodule? */
|
||||
if (task->commits)
|
||||
|
|
@ -1610,7 +1616,7 @@ int fetch_populated_submodules(struct repository *r,
|
|||
goto out;
|
||||
|
||||
if (repo_read_index(r) < 0)
|
||||
die("index file corrupt");
|
||||
die(_("index file corrupt"));
|
||||
|
||||
argv_array_push(&spf.args, "fetch");
|
||||
for (i = 0; i < options->argc; i++)
|
||||
|
|
@ -1627,6 +1633,11 @@ int fetch_populated_submodules(struct repository *r,
|
|||
&spf,
|
||||
"submodule", "parallel/fetch");
|
||||
|
||||
if (spf.submodules_with_errors.len > 0)
|
||||
fprintf(stderr, _("Errors during submodule fetch:\n%s"),
|
||||
spf.submodules_with_errors.buf);
|
||||
|
||||
|
||||
argv_array_clear(&spf.args);
|
||||
out:
|
||||
free_submodules_oids(&spf.changed_submodule_names);
|
||||
|
|
@ -1665,7 +1676,7 @@ unsigned is_submodule_modified(const char *path, int ignore_untracked)
|
|||
cp.out = -1;
|
||||
cp.dir = path;
|
||||
if (start_command(&cp))
|
||||
die("Could not run 'git status --porcelain=2' in submodule %s", path);
|
||||
die(_("Could not run 'git status --porcelain=2' in submodule %s"), path);
|
||||
|
||||
fp = xfdopen(cp.out, "r");
|
||||
while (strbuf_getwholeline(&buf, fp, '\n') != EOF) {
|
||||
|
|
@ -1706,7 +1717,7 @@ unsigned is_submodule_modified(const char *path, int ignore_untracked)
|
|||
fclose(fp);
|
||||
|
||||
if (finish_command(&cp) && !ignore_cp_exit_code)
|
||||
die("'git status --porcelain=2' failed in submodule %s", path);
|
||||
die(_("'git status --porcelain=2' failed in submodule %s"), path);
|
||||
|
||||
strbuf_release(&buf);
|
||||
return dirty_submodule;
|
||||
|
|
@ -1811,7 +1822,7 @@ out:
|
|||
void submodule_unset_core_worktree(const struct submodule *sub)
|
||||
{
|
||||
char *config_path = xstrfmt("%s/modules/%s/config",
|
||||
get_git_common_dir(), sub->name);
|
||||
get_git_dir(), sub->name);
|
||||
|
||||
if (git_config_set_in_file_gently(config_path, "core.worktree", NULL))
|
||||
warning(_("Could not unset core.worktree setting in submodule '%s'"),
|
||||
|
|
@ -1841,7 +1852,7 @@ static int submodule_has_dirty_index(const struct submodule *sub)
|
|||
cp.no_stdout = 1;
|
||||
cp.dir = sub->path;
|
||||
if (start_command(&cp))
|
||||
die("could not recurse into submodule '%s'", sub->path);
|
||||
die(_("could not recurse into submodule '%s'"), sub->path);
|
||||
|
||||
return finish_command(&cp);
|
||||
}
|
||||
|
|
@ -1862,7 +1873,7 @@ static void submodule_reset_index(const char *path)
|
|||
argv_array_push(&cp.args, empty_tree_oid_hex());
|
||||
|
||||
if (run_command(&cp))
|
||||
die("could not reset submodule index");
|
||||
die(_("could not reset submodule index"));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -1914,7 +1925,7 @@ int submodule_move_head(const char *path,
|
|||
ABSORB_GITDIR_RECURSE_SUBMODULES);
|
||||
} else {
|
||||
char *gitdir = xstrfmt("%s/modules/%s",
|
||||
get_git_common_dir(), sub->name);
|
||||
get_git_dir(), sub->name);
|
||||
connect_work_tree_and_git_dir(path, gitdir, 0);
|
||||
free(gitdir);
|
||||
|
||||
|
|
@ -1924,7 +1935,7 @@ int submodule_move_head(const char *path,
|
|||
|
||||
if (old_head && (flags & SUBMODULE_MOVE_HEAD_FORCE)) {
|
||||
char *gitdir = xstrfmt("%s/modules/%s",
|
||||
get_git_common_dir(), sub->name);
|
||||
get_git_dir(), sub->name);
|
||||
connect_work_tree_and_git_dir(path, gitdir, 1);
|
||||
free(gitdir);
|
||||
}
|
||||
|
|
@ -1993,6 +2004,47 @@ out:
|
|||
return ret;
|
||||
}
|
||||
|
||||
int validate_submodule_git_dir(char *git_dir, const char *submodule_name)
|
||||
{
|
||||
size_t len = strlen(git_dir), suffix_len = strlen(submodule_name);
|
||||
char *p;
|
||||
int ret = 0;
|
||||
|
||||
if (len <= suffix_len || (p = git_dir + len - suffix_len)[-1] != '/' ||
|
||||
strcmp(p, submodule_name))
|
||||
BUG("submodule name '%s' not a suffix of git dir '%s'",
|
||||
submodule_name, git_dir);
|
||||
|
||||
/*
|
||||
* We prevent the contents of sibling submodules' git directories to
|
||||
* clash.
|
||||
*
|
||||
* Example: having a submodule named `hippo` and another one named
|
||||
* `hippo/hooks` would result in the git directories
|
||||
* `.git/modules/hippo/` and `.git/modules/hippo/hooks/`, respectively,
|
||||
* but the latter directory is already designated to contain the hooks
|
||||
* of the former.
|
||||
*/
|
||||
for (; *p; p++) {
|
||||
if (is_dir_sep(*p)) {
|
||||
char c = *p;
|
||||
|
||||
*p = '\0';
|
||||
if (is_git_directory(git_dir))
|
||||
ret = -1;
|
||||
*p = c;
|
||||
|
||||
if (ret < 0)
|
||||
return error(_("submodule git dir '%s' is "
|
||||
"inside git dir '%.*s'"),
|
||||
git_dir,
|
||||
(int)(p - git_dir), git_dir);
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* Embeds a single submodules git directory into the superprojects git dir,
|
||||
* non recursively.
|
||||
|
|
@ -2000,7 +2052,7 @@ out:
|
|||
static void relocate_single_git_dir_into_superproject(const char *path)
|
||||
{
|
||||
char *old_git_dir = NULL, *real_old_git_dir = NULL, *real_new_git_dir = NULL;
|
||||
const char *new_git_dir;
|
||||
char *new_git_dir;
|
||||
const struct submodule *sub;
|
||||
|
||||
if (submodule_uses_worktrees(path))
|
||||
|
|
@ -2018,10 +2070,14 @@ static void relocate_single_git_dir_into_superproject(const char *path)
|
|||
if (!sub)
|
||||
die(_("could not lookup name for submodule '%s'"), path);
|
||||
|
||||
new_git_dir = git_path("modules/%s", sub->name);
|
||||
new_git_dir = git_pathdup("modules/%s", sub->name);
|
||||
if (validate_submodule_git_dir(new_git_dir, sub->name) < 0)
|
||||
die(_("refusing to move '%s' into an existing git dir"),
|
||||
real_old_git_dir);
|
||||
if (safe_create_leading_directories_const(new_git_dir) < 0)
|
||||
die(_("could not create directory '%s'"), new_git_dir);
|
||||
real_new_git_dir = real_pathdup(new_git_dir, 1);
|
||||
free(new_git_dir);
|
||||
|
||||
fprintf(stderr, _("Migrating git directory of '%s%s' from\n'%s' to\n'%s'\n"),
|
||||
get_super_prefix_or_empty(), path,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue