feat: specify branch to check out from the fork via username:branch

karolzwolak · karolzwolak · commit d74c08d10b7e · 2025-09-28T14:55:48.000+02:00
diff --git a/docs/keybindings/Keybindings_en.md b/docs/keybindings/Keybindings_en.md
@@ -308,7 +308,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
 | `` n `` | New remote |  |
 | `` d `` | Remove | Remove the selected remote. Any local branches tracking a remote branch from the remote will be unaffected. |
 | `` e `` | Edit | Edit the selected remote's name or URL. |
-| `` F `` | Add fork remote | Quickly add a fork remote by replacing the owner in the origin URL. |
+| `` F `` | Add fork remote | Quickly add a fork remote by replacing the owner in the origin URL and optionally check out a branch from new remote. |
 | `` f `` | Fetch | Fetch updates from the remote repository. This retrieves new commits and branches without merging them into your local branches. |
 | `` / `` | Filter the current view by text |  |
 
diff --git a/docs/keybindings/Keybindings_ja.md b/docs/keybindings/Keybindings_ja.md
@@ -334,7 +334,7 @@ _凡例：`＜c-b＞` はctrl+b、`＜a-b＞` はalt+b、`B` はshift+bを意味
 | `` n `` | 新しいリモート |  |
 | `` d `` | 削除 | 選択したリモートを削除します。そのリモートからのリモートブランチを追跡しているローカルブランチは影響を受けません。 |
 | `` e `` | 編集 | 選択したリモートの名前またはURLを編集します。 |
-| `` F `` | Add fork remote | Quickly add a fork remote by replacing the owner in the origin URL. |
+| `` F `` | Add fork remote | Quickly add a fork remote by replacing the owner in the origin URL and optionally check out a branch from new remote. |
 | `` f `` | フェッチ | リモートリポジトリから更新をフェッチします。これにより、ローカルブランチにマージせずに新しいコミットとブランチを取得します。 |
 | `` / `` | 現在のビューをテキストでフィルタリング |  |
 
diff --git a/docs/keybindings/Keybindings_ko.md b/docs/keybindings/Keybindings_ko.md
@@ -258,7 +258,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
 | `` n `` | 새로운 Remote 추가 |  |
 | `` d `` | Remove | Remove the selected remote. Any local branches tracking a remote branch from the remote will be unaffected. |
 | `` e `` | Edit | Remote를 수정 |
-| `` F `` | Add fork remote | Quickly add a fork remote by replacing the owner in the origin URL. |
+| `` F `` | Add fork remote | Quickly add a fork remote by replacing the owner in the origin URL and optionally check out a branch from new remote. |
 | `` f `` | Fetch | 원격을 업데이트 |
 | `` / `` | Filter the current view by text |  |
 
diff --git a/docs/keybindings/Keybindings_nl.md b/docs/keybindings/Keybindings_nl.md
@@ -286,7 +286,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
 | `` n `` | Voeg een nieuwe remote toe |  |
 | `` d `` | Remove | Remove the selected remote. Any local branches tracking a remote branch from the remote will be unaffected. |
 | `` e `` | Edit | Wijzig remote |
-| `` F `` | Add fork remote | Quickly add a fork remote by replacing the owner in the origin URL. |
+| `` F `` | Add fork remote | Quickly add a fork remote by replacing the owner in the origin URL and optionally check out a branch from new remote. |
 | `` f `` | Fetch | Fetch remote |
 | `` / `` | Filter the current view by text |  |
 
diff --git a/docs/keybindings/Keybindings_pl.md b/docs/keybindings/Keybindings_pl.md
@@ -382,7 +382,7 @@ _Legenda: `<c-b>` oznacza ctrl+b, `<a-b>` oznacza alt+b, `B` oznacza shift+b_
 | `` n `` | Nowy zdalny |  |
 | `` d `` | Usuń | Usuń wybrany zdalny. Wszelkie lokalne gałęzie śledzące gałąź zdalną z tego zdalnego nie zostaną dotknięte. |
 | `` e `` | Edytuj | Edytuj nazwę lub URL wybranego zdalnego. |
-| `` F `` | Add fork remote | Quickly add a fork remote by replacing the owner in the origin URL. |
+| `` F `` | Add fork remote | Quickly add a fork remote by replacing the owner in the origin URL and optionally check out a branch from new remote. |
 | `` f `` | Pobierz | Pobierz aktualizacje z zdalnego repozytorium. Pobiera nowe commity i gałęzie bez scalania ich z lokalnymi gałęziami. |
 | `` / `` | Filtruj bieżący widok po tekście |  |
 
diff --git a/docs/keybindings/Keybindings_pt.md b/docs/keybindings/Keybindings_pt.md
@@ -317,7 +317,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
 | `` n `` | Novo controle |  |
 | `` d `` | Remover | Remover o controle remoto. Quaisquer ramificações locais de rastreamento de um ramo remoto do controle não serão afetadas. |
 | `` e `` | Editar | Edit the selected remote's name or URL. |
-| `` F `` | Add fork remote | Quickly add a fork remote by replacing the owner in the origin URL. |
+| `` F `` | Add fork remote | Quickly add a fork remote by replacing the owner in the origin URL and optionally check out a branch from new remote. |
 | `` f `` | Buscar | Fetch updates from the remote repository. This retrieves new commits and branches without merging them into your local branches. |
 | `` / `` | Filter the current view by text |  |
 
diff --git a/docs/keybindings/Keybindings_ru.md b/docs/keybindings/Keybindings_ru.md
@@ -354,7 +354,7 @@ _Связки клавиш_
 | `` n `` | Добавить новую удалённую ветку |  |
 | `` d `` | Remove | Remove the selected remote. Any local branches tracking a remote branch from the remote will be unaffected. |
 | `` e `` | Edit | Редактировать удалённый репозитории |
-| `` F `` | Add fork remote | Quickly add a fork remote by replacing the owner in the origin URL. |
+| `` F `` | Add fork remote | Quickly add a fork remote by replacing the owner in the origin URL and optionally check out a branch from new remote. |
 | `` f `` | Получить изменения | Получение изменения из удалённого репозитория |
 | `` / `` | Filter the current view by text |  |
 
diff --git a/docs/keybindings/Keybindings_zh-CN.md b/docs/keybindings/Keybindings_zh-CN.md
@@ -382,7 +382,7 @@ _图例：`<c-b>` 意味着ctrl+b, `<a-b>意味着Alt+b, `B` 意味着shift+b_
 | `` n `` | 添加新的远程仓库 |  |
 | `` d `` | 删除 | 删除选中的远程。从远程跟踪远程分支的任何本地分支都不会受到影响。 |
 | `` e `` | 编辑 | 编辑远程仓库 |
-| `` F `` | Add fork remote | Quickly add a fork remote by replacing the owner in the origin URL. |
+| `` F `` | Add fork remote | Quickly add a fork remote by replacing the owner in the origin URL and optionally check out a branch from new remote. |
 | `` f `` | 抓取 | 抓取远程仓库 |
 | `` / `` | 通过文本过滤当前视图 |  |
 
diff --git a/docs/keybindings/Keybindings_zh-TW.md b/docs/keybindings/Keybindings_zh-TW.md
@@ -382,7 +382,7 @@ _說明：`<c-b>` 表示 Ctrl＋B、`<a-b>` 表示 Alt＋B，`B`表示 Shift＋B
 | `` n `` | 新增遠端 |  |
 | `` d `` | Remove | Remove the selected remote. Any local branches tracking a remote branch from the remote will be unaffected. |
 | `` e `` | 編輯 | 編輯遠端 |
-| `` F `` | Add fork remote | Quickly add a fork remote by replacing the owner in the origin URL. |
+| `` F `` | Add fork remote | Quickly add a fork remote by replacing the owner in the origin URL and optionally check out a branch from new remote. |
 | `` f `` | 擷取 | 擷取遠端 |
 | `` / `` | 搜尋 |  |
 
diff --git a/pkg/gui/controllers/remotes_controller.go b/pkg/gui/controllers/remotes_controller.go
@@ -142,7 +142,7 @@ func (self *RemotesController) enter(remote *models.Remote) error {
 	return nil
 }
 
-func (self *RemotesController) addRemoteHelper(remoteName string, remoteUrl string) error {
+func (self *RemotesController) addRemoteHelper(remoteName string, remoteUrl string, branchToCheckout string) error {
 	self.c.LogAction(self.c.Tr.Actions.AddRemote)
 	if err := self.c.Git().Remote.AddRemote(remoteName, remoteUrl); err != nil {
 		return err
@@ -165,7 +165,7 @@ func (self *RemotesController) addRemoteHelper(remoteName string, remoteUrl stri
 	}
 
 	// Fetch the new remote
-	return self.fetch(self.c.Contexts().Remotes.GetSelected())
+	return self.fetchAndCheckout(self.c.Contexts().Remotes.GetSelected(), branchToCheckout)
 }
 
 func (self *RemotesController) add() error {
@@ -175,7 +175,7 @@ func (self *RemotesController) add() error {
 			self.c.Prompt(types.PromptOpts{
 				Title: self.c.Tr.NewRemoteUrl,
 				HandleConfirm: func(remoteUrl string) error {
-					return self.addRemoteHelper(remoteName, remoteUrl)
+					return self.addRemoteHelper(remoteName, remoteUrl, "")
 				},
 			})
 
@@ -223,6 +223,14 @@ func (self *RemotesController) addFork(baseRemote *models.Remote) error {
 	self.c.Prompt(types.PromptOpts{
 		Title: self.c.Tr.AddForkRemoteUsername,
 		HandleConfirm: func(forkUsername string) error {
+			branchToCheckout := ""
+
+			parts := strings.SplitN(forkUsername, ":", 2)
+			if len(parts) == 2 {
+				forkUsername = parts[0]
+				branchToCheckout = parts[1]
+			}
+
 			self.c.Prompt(types.PromptOpts{
 				Title:          self.c.Tr.NewRemoteName,
 				InitialContent: forkUsername,
@@ -236,7 +244,7 @@ func (self *RemotesController) addFork(baseRemote *models.Remote) error {
 						return err
 					}
 
-					return self.addRemoteHelper(remoteName, remoteUrl)
+					return self.addRemoteHelper(remoteName, remoteUrl, branchToCheckout)
 				},
 			})
 
@@ -318,16 +326,22 @@ func (self *RemotesController) edit(remote *models.Remote) error {
 }
 
 func (self *RemotesController) fetch(remote *models.Remote) error {
+	return self.fetchAndCheckout(remote, "")
+}
+
+func (self *RemotesController) fetchAndCheckout(remote *models.Remote, branchName string) error {
 	return self.c.WithInlineStatus(remote, types.ItemOperationFetching, context.REMOTES_CONTEXT_KEY, func(task gocui.Task) error {
 		err := self.c.Git().Sync.FetchRemote(task, remote.Name)
 		if err != nil {
 			return err
 		}
-
+		if branchName != "" {
+			err = self.c.Git().Branch.New(branchName, remote.Name+"/"+branchName)
+		}
 		self.c.Refresh(types.RefreshOptions{
 			Scope: []types.RefreshableView{types.BRANCHES, types.REMOTES},
 			Mode:  types.ASYNC,
 		})
-		return nil
+		return err
 	})
 }
diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go
@@ -1605,9 +1605,9 @@ func EnglishTranslationSet() *TranslationSet {
 		NewRemote:                            `New remote`,
 		NewRemoteName:                        `New remote name:`,
 		NewRemoteUrl:                         `New remote url:`,
-		AddForkRemoteUsername:                `Enter the owner of the fork (username or org):`,
+		AddForkRemoteUsername:                `Fork owner (username/org). Use username:branch to check out a branch`,
 		AddForkRemote:                        `Add fork remote`,
-		AddForkRemoteTooltip:                 `Quickly add a fork remote by replacing the owner in the origin URL.`,
+		AddForkRemoteTooltip:                 `Quickly add a fork remote by replacing the owner in the origin URL and optionally check out a branch from new remote.`,
 		ViewBranches:                         "View branches",
 		EditRemoteName:                       `Enter updated remote name for {{.remoteName}}:`,
 		EditRemoteUrl:                        `Enter updated remote url for {{.remoteName}}:`,
