Re: [PATCH 10/15] update submodules: add submodule_go_from_to
- From
Stefan Beller <sbeller@google.com>
- Date
- Feb 16, 2017, 21:33 UTC
- Message-ID
- <CAGZ79kYqa4jX-q_GHLyCE80VipBOHq48RZ_f=bGAw1CkyyLCBw@mail.gmail.com>
- In-Reply-To
- <xmqq7f4px2fi.fsf@gitster.mtv.corp.google.com>
On Thu, Feb 16, 2017 at 1:15 PM, Junio C Hamano <gitster@pobox.com> wrote:
> [administrivia: I've been seeing "unlisted-recipients:; (no To-header on input)" > for all of your recent patches. Can it be corrected on your end, please?]
I cc'd everyone and had no to field, actually. Maybe git-send-email should complain more loudly when I am holding it wrong.
Show 6 quoted lines
>> + cp.git_cmd = 1; >> + argv_array_pushl(&cp.args, "diff-index", "--cached", "HEAD", NULL); > > We'd want to use the QUICK optimization here, I suspect. This > caller does not need to (or want to) learn which exact paths are > modified, right?
ok
Show 5 quoted lines
>> + if (run_command(&cp))
>> + die("could not clean submodule index");
>> +}
>
> Do s/clean/reset/ everywhere above.ok
Show 9 quoted lines
> >> +/** >> + * 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. >> + * >> + * TODO: move dryrun and forced to flags. > > The reason why this seeingly trivial thing is left as TODO is...???
will do. The reason was to first get the grand design right before spending more time in the details.
Show 14 quoted lines
>
>> + */
>> +int submodule_go_from_to(const char *path,
>> + const char *old,
>> + const char *new,
>> + int dry_run,
>> + int force)
>> +{
>
> go-from-to does not tell me what it does, but my cursory read of the
> body of the function tells me that this is doing a checkout of a
> branch in the submodule? The operation in builtin/checkout.c that
> conceptually correspond to this is called switch_branches(), I
> think, so perhaps submodule_switch_branches() is a better name?Well as of now all submodule operations (submodule update mostly) end up with detached HEADs in the submodule. So it is rather going from one state (sha1) to another given sha1.
I would rather compare it to checkout_entry/write_entry in entry.c except that there are more things to go wrong. A single file has no notion of its own index or dirtiness.
Show 36 quoted lines
>
>> + 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 (!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_clean_index(path);
>> + }
>> + }
>> +
>> + if (old && !force) {
>> + /* Check if the submodule has a dirty index. */
>> + if (submodule_has_dirty_index(sub)) {
>> + /* print a thing here? */
>> + return -1;
>> + }
>
> Isn't it too late to do this here? You already reset the index
> in the submodule, no?Yes this is confusing. We run this function first as a dry_run, and in a second pass as a real run. So the order inside the function is confusing as we would run this first in the dry run.
> > Is the idea that changes that are only in the submodule's working > tree are noticed by later "read-tree -u -m" down there? Not > complaining but trying to understand.
I think (as a first step) we only want to allow a clean index in submodules, as then we have to implement less cases at first.