Git: main repository should be default when submodules are present (SSH remote)

[dahjelle]

Summary

When opening a repository (via SSH remote) with multiple submodules, the git panel picks one of the submodules (arbitrarily?) as the git the active git repository, instead of the top-level repository.

Description

Steps to trigger the problem:

1. Open a git repository with submodules via SSH remote.
2. Open the git panel.
3. Look at the active repository/branch selector.

Actual Behavior:

• A random(?) submodule is selected as the repository for the git panel to work with, instead of the top-level repository.

Expected Behavior:

• The top-level git repository should be selected by default.
• The repository picker should have submodules sorted alphabetically. :-)

Zed Version and System Specs

Zed: v0.186.7 (Zed)
OS: macOS 15.4.1
Memory: 16 GiB
Architecture: aarch64

[benjaminglass1]

This reproduces for me on the pytorch repository, which has 40-50 submodules. It's an annoying pain point with the remote extension, particularly since I have to pick the correct repository after every time the remote connection drops.

[G36maid]

Same here — I can confirm this behavior.
I’m working on a remote development server with a project that includes many submodules (an infra-like setup with multiple containers), and the Git panel consistently selects one of the submodules’ branches instead of the top-level repository.

I saw this issue on the Git board.
I’d like to take a look at this and see if I can work on a fix.

[amtoaer]

@G36maid My apologies, I started working on this issue a few days ago and only saw your comment after finding a solution.
If you don't mind, could you please help test the fix to see if it works? Much appreciated!

[esthertrapadoux]

@amtoaer @G36maid can one of you take lead and maybe you can pair on the issue? We can make @G36maid the owner for now and let me know if something changes.

[G36maid]

Thanks @amtoaer — I just tested the fix on my remote setup, and it works perfectly!
Glad to see the issue resolved and closed. 🎉