On 03/09, Stefan Beller wrote:
> +/**
> + * Moves a submodule at a given path from a given head to another new head.
> + * For edge cases (a submodule coming into existence or removing a submodule)
> + * pass NULL for old or new respectively.
> + */
> +int submodule_move_head(const char *path,
> + const char *old,
> + const char *new,
> + unsigned flags)
> +{
> + int ret = 0;
> + struct child_process cp = CHILD_PROCESS_INIT;
> + const struct submodule *sub;
> +
> + sub = submodule_from_path(null_sha1, path);
> +
> + if (!sub)
> + die("BUG: could not get submodule information for '%s'", path);
> +
> + if (old && !(flags & SUBMODULE_MOVE_HEAD_FORCE)) {
> + /* Check if the submodule has a dirty index. */
> + if (submodule_has_dirty_index(sub))
> + return error(_("submodule '%s' has dirty index"), path);
> + }
> +
> + if (!(flags & SUBMODULE_MOVE_HEAD_DRY_RUN)) {
> + if (old) {
> + if (!submodule_uses_gitfile(path))
> + absorb_git_dir_into_superproject("", path,
> + ABSORB_GITDIR_RECURSE_SUBMODULES);
> + } else {
> + struct strbuf sb = STRBUF_INIT;
> + strbuf_addf(&sb, "%s/modules/%s",
> + get_git_common_dir(), sub->name);
> + connect_work_tree_and_git_dir(path, sb.buf);
> + strbuf_release(&sb);
> +
> + /* make sure the index is clean as well */
> + submodule_reset_index(path);
> + }
> + }
> +
> + prepare_submodule_repo_env_no_git_dir(&cp.env_array);
> +
> + cp.git_cmd = 1;
> + cp.no_stdin = 1;
> + cp.dir = path;
> +
> + argv_array_pushf(&cp.args, "--super-prefix=%s/", path);
Missed this one too. Same question as the other spot.
--
Brandon Williams