`u` moves the pin of the selection to the tip of its ref when the pin is
only behind it: a switch to that branch with exactly the tip the row
shows, nothing fetched; if the ref moved meanwhile, nothing happens. On
the superproject it fast-forwards the branch to its upstream and restores
the submodules (git pull --ff-only from the last fetch).
Switch now fast-forwards a local branch that is only behind the chosen
remote branch, unless another worktree has it checked out, and keeps a
checked-out branch that tracks it under another name. A branch with
commits of its own is still never moved.
Stage pin is dropped: switching to the branch already stages it. The
detail pane's palette wraps instead of cutting off keys. Add D29 and F59.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
A restored submodule whose pin is a branch tip ends on that branch instead
of a detached HEAD: the local branch tracking the ref, else the ref created
as a tracking branch, else another local branch, else another remote branch
at the pin. No branch is moved; in-sync submodules are included (D28).
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The ref of a pin was the closest branch containing it, so a pin on a
feature branch looked like a perfect one, and the ref changed with the
branch checked out in the submodule. Split it in two:
- Pin.Target is the branch the pin should be on: `branch =` of
.gitmodules (none if it does not exist locally), else the remote's
default branch.
- Pin.Ref is shown: the target if the pin is on it, else the branch
containing the pin with the fewest commits after it. A tie goes to the
upstream of the checked-out branch, then to the first name; no branch is
a favorite.
A pushed pin that is not on its target is `off target`, a new issue at the
new level Info (blue), counted in the header and below collapsed rows. The
spine shows the target's tip, labelled with its branch name, so the
distance from it is visible; a diverged one is the fork. The role words in
a spine label are styled separately and `you` is bold.
Add Status.TargetTip, TargetDrift and Bases.Target, Pin.Target and
Pin.Branches; drop RefSource.IsTarget. The detail pane's label column is 11
wide for the word `off target`.
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
A tip, checkout or committed pin that has diverged from the pin gets its
own lane, which joins the main lane at a "base" node: the merge base of
the two, with its SHA and subject. Only one diverged commit is drawn as a
fork; with two, or without a merge base, the nodes stay in a line with
the "diverged" gap.
Add Status.Bases, filled by the git provider with `merge-base` for each
diverged commit.
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Replace the Pinned/Checkout/Tip rows and the list of commits between pin
and tip with one line of history, newest on top: a node per commit with
its roles (pin, tip, you, staged, HEAD) and the number of commits between
two nodes. A staged pin shows the committed pin as its own node and notes
when it moves back. All three on one commit read "in sync".
Add Status.Drift, Committed and CommittedDrift and Status.Spine(); drop
Status.Between and Repo.FetchedAt. The fetch age moves from the header to
the detail pane (right-aligned in the name's line). The header summary is
right-aligned, ordered by importance and cut with an ellipsis if too narrow.
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
b opens a centered popup with a search line and the local and remote
branches of the selection. Enter stages the branch tip as the pin of a
submodule, restores it (and everything below) to it, and puts HEAD on the
branch; a remote branch gets a local tracking branch unless one exists
elsewhere. Works on the superproject too. Losses are asked like restore.
The backdrop behind the popup is dimmed.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Staged pins survive a restore at every depth and are the targets of the
submodules below. For a submodule with a staged pin, x asks whether to
restore to the staged or the committed pin, the latter unstaging it.
Staged pins of a repository that moves count as a loss.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Restores the selection and all submodules below it recursively, asking
only if work would be lost. May clone/fetch missing objects (D23).
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The header stands for the root repository: it is selected on startup,
shows the root's own state word, and the detail pane shows its state
like a submodule's (HEAD vs. upstream, changes, unpushed, leftover
submodule clones as untracked repositories). Submodules are ignored in
the root's changes; their rows show them.
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
A pin on a pushed feature branch showed as diverged from origin/main
because the .gitmodules branch won before any distance was compared.
Now the branch containing the pin with the fewest commits after it wins;
the .gitmodules branch, the upstream and the remote default branch only
break ties and are always compared. An unpushed pin compares just those
preferred refs by commits on either side.
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
c copies the absolute directory of the selected submodule via OSC 52.
Keys are grouped into navigation (footer left), global (footer right)
and submodule (detail pane palette, footer if the pane can't show it).
Adds a key reference table to the UX guide.
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
- On startup, after the local state is shown, fetch the superproject and
every initialized submodule (all remotes, prune, at most 8 at once).
Fetches never prompt; failures show git's message. --no-fetch skips it,
f fetches again.
- The header shows "fetching n/m", then the fetch age and failures; the
detail pane shows each submodule's last fetch and fetch errors.
- The git provider polls each repository's metadata (refs, HEAD, index,
.gitmodules) every 2 s and reports changes. The app reloads only what
changed, keeping old values, expansion and cursor; loads are
single-flight with coalesced reruns. Refresh is driven by the
repositories, so a fetch in another shell updates the view like ours.
- r reloads everything (worktree edits are not watched).
- Docs: F50-F53, N1/N8 rewritten, D18-D20 (D12 superseded).
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
For a dirty submodule, list the changed files so the user can remember
what they were doing there:
Changes 5 files · 2M 1A 1D 1R · +37 −12
──────────────────────────────────
M render.go src/render/ +20 −4 3d ago
? scratch.txt 5m ago
- Status.Changes: files changed against HEAD (staged and unstaged
combined) with kind, line counts and modification time; sorted by kind,
then by size; capped at 200 with totals over all files.
- Git provider: parse `status --porcelain=v2 -z` and one
`diff HEAD --numstat -z -M`, only for dirty submodules.
- Detail pane: flat list with a colored status letter per file, like IDE
source-control views; counts and age in compact columns; up to 10 files,
every kind keeps a line, the rest is summarized as "n more".
- Fixture gains libs/work with every kind of change; mock data extended.
- Docs: F24, change preview in the UX guide, D17.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Implement submodule.Provider with the git CLI so submarine reads real
repositories: `submarine [dir]`, with `--mock` for the built-in data.
- Tree reads .gitmodules recursively; Status derives presence, checkout,
worktree, staged pin, pushed state and pin -> ref resolution from local
git commands only (no network).
- Concurrent Status calls are bounded by runtime.NumCPU().
- scripts/make-fixture.sh builds a superproject covering every state; the
integration tests run against it.
- theme.Ago shows "never" for a zero time.
- Docs updated; decisions D14-D16 added.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
