Merge remote-tracking branch 'origin/main' into feat/nested-git-repos

# Conflicts: # packages/ui/src/components/views/GitView.tsx # packages/ui/src/stores/DOCUMENTATION.md # packages/ui/src/stores/useGitStore.ts
2026-08-30 09:48:35 +05:30
parent e19b6ad3be 7fb246d530
commit f6ffb0a1fe
640 changed files with 46571 additions and 5636 deletions
@@ -1372,8 +1372,10 @@ export const GitView: React.FC<GitViewProps> = ({ isActive }) => {
    }

    try {
-      await git.checkoutBranch(gitDirectory, normalized);
-      toast.success(t('gitView.toast.checkedOut', { name: normalized }));
+      // Picking a remote-tracking branch checks out the local branch that
+      // tracks it, so report the branch the repository actually landed on.
+      const result = await git.checkoutBranch(gitDirectory, normalized);
+      toast.success(t('gitView.toast.checkedOut', { name: result?.branch || normalized }));
      await refreshStatusAndBranches();
      await refreshLog();
    } catch (err) {