Re: [RFC] Branches with --recurse-submodules

From: Glen Choo <chooglen@google.com>
Date: Nov 10, 2021, 18:21 UTC
Message-ID: <kl6lh7cjvpm3.fsf@chooglen-macbookpro.roam.corp.google.com>
In-Reply-To: <kl6lv912uvjv.fsf@chooglen-macbookpro.roam.corp.google.com>

I found some points that I should have given more attention to in the RFC. I'd appreciate any and all feedback :)

Glen Choo <chooglen@google.com> writes:

Show 6 quoted lines

> In a superproject-submodule relationship there is some ambiguity in what
> ‘checkout the branch `topic`’ should mean (does the submodule use its
> topic branch, or the version recorded in the superproject’s gitlink?).
> Our approach is to preserve existing semantics where reasonable - the
> ref name refers to the superproject’s ref, just as it does without
> --recurse-submodules.

Because a gitlink only contains a commit id, the submodule branch will use a plain commit id as the branch point. This gives the correct ref, but it gives no hints as to what the submodule branch should track.

The current thought process is to set up tracking using the ref name and the submodule's config. Thus, a more complete description of

  git branch --recurse-submodules topic origin/main

is something like:

* for each repository, create the 'topic' branch where each 'topic'
  branch points to the version recorded in the superproject's
  'origin/main'
* for each repository, setup tracking for the 'topic' branch using the
  repository's own 'origin/main' as the branch point

Note that there is no guarantee that a submodule's 'origin/main' points to the same commit as the superproject's 'origin/main', or if the submodule's 'origin/main' even exists.

If tracking information cannot be setup, we will still create the branch; we will only warn users when they run a command that requires tracking information e.g. fetch or push.

Show 13 quoted lines

> === Switching _from_ a branch `topic`, i.e. `git {switch,checkout}`
>
> Check `topic` if each submodule’s worktree is clean (except for
> gitlinks), and has one of the following checked out:
>
> * `topic`
> * the commit id in the superproject gitlink
>
> This allows the user to switch with a dirty worktree (with respect to
> the superproject). We consider this acceptable because the submodule
> commits are tracked by the submodule branch. This is helpful when a user
> needs to switch branches before they are ready to commit to the
> superproject.

Note that this is how git switch with submodules already works - users can switch away from a dirty superproject worktree as long as the submodule worktrees are not dirty. However, without branches, this is perilous because a user could unintentionally switch away from their submodule WIP and have no easy way of recovering their work.

The proposed UX solves this by making the WIP tracked by a branch by default. If a user switches _away_ from their WIP 'topic' branch...

Show 12 quoted lines

> === Switching _to_ a branch `topic`, i.e. `git {switch,checkout} topic`
>
> Switch to `topic` in the superproject. Then in each submodule, switch to:
>
> * `topic`, if it exists
> * Otherwise, the commit id in the superproject gitlink (and warn the
>   user that HEAD is detached)
>
> If the submodule `topic` points to a different commit from the
> superproject gitlink, this will leave the superproject with a dirty
> worktree with respect to the gitlinks. This allows a user to recover
> work if they had previously switched _away from_ "topic".

they can still recover their WIP state by switching _back_ to their WIP 'topic' branch.