Better logic for knowing which repo we're in

Only show worktree in status panel if not the main worktree and worktrees are supported
Hide worktree functionality on old git versions
2026-09-28 10:16:22 -04:00 · 2023-07-17 14:38:08 +10:00 · 2023-07-17 14:10:32 +10:00 · 2023-07-17 14:10:32 +10:00 · 2023-07-17 13:43:10 +10:00 · 2023-07-17 09:48:37 +10:00
241 changed files with 5113 additions and 68124 deletions
@@ -1,26 +0,0 @@
-changelog:
-  exclude:
-    labels:
-      - ignore-for-release
-  categories:
-    - title: Features ✨
-      labels:
-        - feature
-    - title: Enhancements 🔥
-      labels:
-        - enhancement
-    - title: Fixes 🔧
-      labels:
-        - bug
-    - title: Maintenance ⚙️
-      labels:
-        - maintenance
-    - title: Docs 📖
-      labels:
-        - docs
-    - title: I18n 🌎
-      labels:
-        - i18n
-    - title: Other Changes
-      labels:
-        - "*"
@@ -19,10 +19,6 @@ jobs:
          go-version: 1.18.x
      - name: Run goreleaser
        uses: goreleaser/goreleaser-action@v1
-        with:
-          distribution: goreleaser
-          version: v1.17.2
-          args: release --clean
        env:
          GITHUB_TOKEN: ${{secrets.GITHUB_API_TOKEN}}
  homebrew:
@@ -204,11 +204,3 @@ jobs:
      - name: errors
        run: golangci-lint run
        if: ${{ failure() }}
-  check-required-label:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: mheap/github-action-required-labels@v5
-        with:
-          mode: exactly
-          count: 1
-          labels: "ignore-for-release, feature, enhancement, bug, maintenance, docs, i18n"
@@ -12,7 +12,7 @@ builds:
      - amd64
      - arm
      - arm64
-      - '386'
+      - 386
    # Default is `-s -w -X main.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.Date}}`.
    ldflags:
      - -s -w -X main.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.Date}} -X main.buildSource=binaryRelease
@@ -0,0 +1 @@
+eUTlaNqeTB
@@ -0,0 +1 @@
+qtuVMihtEl
@@ -308,7 +308,6 @@ os:
  editAtLine: 'myeditor --line={{line}} {{filename}}'
  editAtLineAndWait: 'myeditor --block --line={{line}} {{filename}}'
  editInTerminal: true
-  openDirInEditor: 'myeditor {{dir}}'
 ```

 The `editInTerminal` option is used to decide whether lazygit needs to suspend
@@ -74,7 +74,6 @@ The permitted contexts are:
 | -------------- | -------------------------------------------------------------------------------------------------------- |
 | status         | The 'Status' tab                                                                                         |
 | files          | The 'Files' tab                                                                                          |
-| worktrees      | The 'Worktrees' tab                                                                                      |
 | localBranches  | The 'Local Branches' tab                                                                                 |
 | remotes        | The 'Remotes' tab                                                                                        |
 | remoteBranches | The context you get when pressing enter on a remote in the remotes tab                                   |
@@ -301,7 +300,6 @@ SelectedRemote
 SelectedTag
 SelectedStashEntry
 SelectedCommitFile
-SelectedWorktree
 CheckedOutBranch
 ```

@@ -89,7 +89,6 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
  <kbd>t</kbd>: Revert commit
  <kbd>T</kbd>: Tag commit
  <kbd>&lt;c-l&gt;</kbd>: Open log menu
-  <kbd>w</kbd>: View worktree options
  <kbd>&lt;space&gt;</kbd>: Checkout commit
  <kbd>y</kbd>: Copy commit attribute
  <kbd>o</kbd>: Open commit in browser
@@ -155,7 +154,6 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
  <kbd>g</kbd>: View reset options
  <kbd>R</kbd>: Rename branch
  <kbd>u</kbd>: Set/Unset upstream
-  <kbd>w</kbd>: View worktree options
  <kbd>&lt;enter&gt;</kbd>: View commits
  <kbd>/</kbd>: Filter the current view by text
 </pre>
@@ -233,7 +231,6 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_

 <pre>
  <kbd>&lt;c-o&gt;</kbd>: Copy commit SHA to clipboard
-  <kbd>w</kbd>: View worktree options
  <kbd>&lt;space&gt;</kbd>: Checkout commit
  <kbd>y</kbd>: Copy commit attribute
  <kbd>o</kbd>: Open commit in browser
@@ -257,7 +254,6 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
  <kbd>d</kbd>: Delete branch
  <kbd>u</kbd>: Set as upstream of checked-out branch
  <kbd>g</kbd>: View reset options
-  <kbd>w</kbd>: View worktree options
  <kbd>&lt;enter&gt;</kbd>: View commits
  <kbd>/</kbd>: Filter the current view by text
 </pre>
@@ -280,7 +276,6 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
  <kbd>d</kbd>: Drop
  <kbd>n</kbd>: New branch
  <kbd>r</kbd>: Rename stash
-  <kbd>w</kbd>: View worktree options
  <kbd>&lt;enter&gt;</kbd>: View selected item's files
  <kbd>/</kbd>: Filter the current view by text
 </pre>
@@ -299,7 +294,6 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_

 <pre>
  <kbd>&lt;c-o&gt;</kbd>: Copy commit SHA to clipboard
-  <kbd>w</kbd>: View worktree options
  <kbd>&lt;space&gt;</kbd>: Checkout commit
  <kbd>y</kbd>: Copy commit attribute
  <kbd>o</kbd>: Open commit in browser
@@ -317,7 +311,6 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
 <pre>
  <kbd>&lt;c-o&gt;</kbd>: Copy submodule name to clipboard
  <kbd>&lt;enter&gt;</kbd>: Enter submodule
-  <kbd>&lt;space&gt;</kbd>: Enter submodule
  <kbd>d</kbd>: Remove submodule
  <kbd>u</kbd>: Update submodule
  <kbd>n</kbd>: Add new submodule
@@ -335,18 +328,6 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
  <kbd>P</kbd>: Push tag
  <kbd>n</kbd>: Create tag
  <kbd>g</kbd>: View reset options
-  <kbd>w</kbd>: View worktree options
  <kbd>&lt;enter&gt;</kbd>: View commits
  <kbd>/</kbd>: Filter the current view by text
 </pre>
-
-## Worktrees
-
-<pre>
-  <kbd>n</kbd>: Create worktree
-  <kbd>&lt;space&gt;</kbd>: Switch to worktree
-  <kbd>&lt;enter&gt;</kbd>: Switch to worktree
-  <kbd>o</kbd>: Open in editor
-  <kbd>d</kbd>: Remove worktree
-  <kbd>/</kbd>: Filter the current view by text
-</pre>
@@ -52,7 +52,6 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
  <kbd>d</kbd>: Drop
  <kbd>n</kbd>: 新しいブランチを作成
  <kbd>r</kbd>: Stashを変更
-  <kbd>w</kbd>: View worktree options
  <kbd>&lt;enter&gt;</kbd>: View selected item's files
  <kbd>/</kbd>: Filter the current view by text
 </pre>
@@ -61,7 +60,6 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_

 <pre>
  <kbd>&lt;c-o&gt;</kbd>: コミットのSHAをクリップボードにコピー
-  <kbd>w</kbd>: View worktree options
  <kbd>&lt;space&gt;</kbd>: コミットをチェックアウト
  <kbd>y</kbd>: コミットの情報をコピー
  <kbd>o</kbd>: ブラウザでコミットを開く
@@ -74,17 +72,6 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
  <kbd>/</kbd>: 検索を開始
 </pre>

-## Worktrees
-
-<pre>
-  <kbd>n</kbd>: Create worktree
-  <kbd>&lt;space&gt;</kbd>: Switch to worktree
-  <kbd>&lt;enter&gt;</kbd>: Switch to worktree
-  <kbd>o</kbd>: Open in editor
-  <kbd>d</kbd>: Remove worktree
-  <kbd>/</kbd>: Filter the current view by text
-</pre>
-
 ## コミット

 <pre>
@@ -108,7 +95,6 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
  <kbd>t</kbd>: コミットをrevert
  <kbd>T</kbd>: タグを作成
  <kbd>&lt;c-l&gt;</kbd>: ログメニューを開く
-  <kbd>w</kbd>: View worktree options
  <kbd>&lt;space&gt;</kbd>: コミットをチェックアウト
  <kbd>y</kbd>: コミットの情報をコピー
  <kbd>o</kbd>: ブラウザでコミットを開く
@@ -147,7 +133,6 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
 <pre>
  <kbd>&lt;c-o&gt;</kbd>: サブモジュール名をクリップボードにコピー
  <kbd>&lt;enter&gt;</kbd>: サブモジュールを開く
-  <kbd>&lt;space&gt;</kbd>: サブモジュールを開く
  <kbd>d</kbd>: サブモジュールを削除
  <kbd>u</kbd>: サブモジュールを更新
  <kbd>n</kbd>: サブモジュールを新規追加
@@ -175,7 +160,6 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
  <kbd>P</kbd>: タグをpush
  <kbd>n</kbd>: タグを作成
  <kbd>g</kbd>: View reset options
-  <kbd>w</kbd>: View worktree options
  <kbd>&lt;enter&gt;</kbd>: コミットを閲覧
  <kbd>/</kbd>: Filter the current view by text
 </pre>
@@ -227,7 +211,6 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
  <kbd>g</kbd>: View reset options
  <kbd>R</kbd>: ブランチ名を変更
  <kbd>u</kbd>: Set/Unset upstream
-  <kbd>w</kbd>: View worktree options
  <kbd>&lt;enter&gt;</kbd>: コミットを閲覧
  <kbd>/</kbd>: Filter the current view by text
 </pre>
@@ -322,7 +305,6 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
  <kbd>d</kbd>: ブランチを削除
  <kbd>u</kbd>: Set as upstream of checked-out branch
  <kbd>g</kbd>: View reset options
-  <kbd>w</kbd>: View worktree options
  <kbd>&lt;enter&gt;</kbd>: コミットを閲覧
  <kbd>/</kbd>: Filter the current view by text
 </pre>
@@ -331,7 +313,6 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_

 <pre>
  <kbd>&lt;c-o&gt;</kbd>: コミットのSHAをクリップボードにコピー
-  <kbd>w</kbd>: View worktree options
  <kbd>&lt;space&gt;</kbd>: コミットをチェックアウト
  <kbd>y</kbd>: コミットの情報をコピー
  <kbd>o</kbd>: ブラウザでコミットを開く
@@ -48,7 +48,6 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_

 <pre>
  <kbd>&lt;c-o&gt;</kbd>: 커밋 SHA를 클립보드에 복사
-  <kbd>w</kbd>: View worktree options
  <kbd>&lt;space&gt;</kbd>: 커밋을 체크아웃
  <kbd>y</kbd>: 커밋 attribute 복사
  <kbd>o</kbd>: 브라우저에서 커밋 열기
@@ -69,7 +68,6 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
  <kbd>d</kbd>: Drop
  <kbd>n</kbd>: 새 브랜치 생성
  <kbd>r</kbd>: Rename stash
-  <kbd>w</kbd>: View worktree options
  <kbd>&lt;enter&gt;</kbd>: View selected item's files
  <kbd>/</kbd>: Filter the current view by text
 </pre>
@@ -78,7 +76,6 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_

 <pre>
  <kbd>&lt;c-o&gt;</kbd>: 커밋 SHA를 클립보드에 복사
-  <kbd>w</kbd>: View worktree options
  <kbd>&lt;space&gt;</kbd>: 커밋을 체크아웃
  <kbd>y</kbd>: 커밋 attribute 복사
  <kbd>o</kbd>: 브라우저에서 커밋 열기
@@ -91,17 +88,6 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
  <kbd>/</kbd>: 검색 시작
 </pre>

-## Worktrees
-
-<pre>
-  <kbd>n</kbd>: Create worktree
-  <kbd>&lt;space&gt;</kbd>: Switch to worktree
-  <kbd>&lt;enter&gt;</kbd>: Switch to worktree
-  <kbd>o</kbd>: Open in editor
-  <kbd>d</kbd>: Remove worktree
-  <kbd>/</kbd>: Filter the current view by text
-</pre>
-
 ## 메뉴

 <pre>
@@ -191,7 +177,6 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
  <kbd>g</kbd>: View reset options
  <kbd>R</kbd>: 브랜치 이름 변경
  <kbd>u</kbd>: Set/Unset upstream
-  <kbd>w</kbd>: View worktree options
  <kbd>&lt;enter&gt;</kbd>: 커밋 보기
  <kbd>/</kbd>: Filter the current view by text
 </pre>
@@ -211,7 +196,6 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
 <pre>
  <kbd>&lt;c-o&gt;</kbd>: 서브모듈 이름을 클립보드에 복사
  <kbd>&lt;enter&gt;</kbd>: 서브모듈 열기
-  <kbd>&lt;space&gt;</kbd>: 서브모듈 열기
  <kbd>d</kbd>: 서브모듈 삭제
  <kbd>u</kbd>: 서브모듈 업데이트
  <kbd>n</kbd>: 새로운 서브모듈 추가
@@ -242,7 +226,6 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
  <kbd>d</kbd>: 브랜치 삭제
  <kbd>u</kbd>: Set as upstream of checked-out branch
  <kbd>g</kbd>: View reset options
-  <kbd>w</kbd>: View worktree options
  <kbd>&lt;enter&gt;</kbd>: 커밋 보기
  <kbd>/</kbd>: Filter the current view by text
 </pre>
@@ -270,7 +253,6 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
  <kbd>t</kbd>: 커밋 되돌리기
  <kbd>T</kbd>: Tag commit
  <kbd>&lt;c-l&gt;</kbd>: 로그 메뉴 열기
-  <kbd>w</kbd>: View worktree options
  <kbd>&lt;space&gt;</kbd>: 커밋을 체크아웃
  <kbd>y</kbd>: 커밋 attribute 복사
  <kbd>o</kbd>: 브라우저에서 커밋 열기
@@ -312,7 +294,6 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
  <kbd>P</kbd>: 태그를 push
  <kbd>n</kbd>: 태그를 생성
  <kbd>g</kbd>: View reset options
-  <kbd>w</kbd>: View worktree options
  <kbd>&lt;enter&gt;</kbd>: 커밋 보기
  <kbd>/</kbd>: Filter the current view by text
 </pre>
@@ -98,7 +98,6 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
  <kbd>g</kbd>: Bekijk reset opties
  <kbd>R</kbd>: Hernoem branch
  <kbd>u</kbd>: Set/Unset upstream
-  <kbd>w</kbd>: View worktree options
  <kbd>&lt;enter&gt;</kbd>: Bekijk commits
  <kbd>/</kbd>: Filter the current view by text
 </pre>
@@ -148,7 +147,6 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
  <kbd>t</kbd>: Commit ongedaan maken
  <kbd>T</kbd>: Tag commit
  <kbd>&lt;c-l&gt;</kbd>: Open log menu
-  <kbd>w</kbd>: View worktree options
  <kbd>&lt;space&gt;</kbd>: Checkout commit
  <kbd>y</kbd>: Copy commit attribute
  <kbd>o</kbd>: Open commit in browser
@@ -211,7 +209,6 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_

 <pre>
  <kbd>&lt;c-o&gt;</kbd>: Kopieer commit SHA naar klembord
-  <kbd>w</kbd>: View worktree options
  <kbd>&lt;space&gt;</kbd>: Checkout commit
  <kbd>y</kbd>: Copy commit attribute
  <kbd>o</kbd>: Open commit in browser
@@ -235,7 +232,6 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
  <kbd>d</kbd>: Verwijder branch
  <kbd>u</kbd>: Stel in als upstream van uitgecheckte branch
  <kbd>g</kbd>: Bekijk reset opties
-  <kbd>w</kbd>: View worktree options
  <kbd>&lt;enter&gt;</kbd>: Bekijk commits
  <kbd>/</kbd>: Filter the current view by text
 </pre>
@@ -280,7 +276,6 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
  <kbd>d</kbd>: Laten vallen
  <kbd>n</kbd>: Nieuwe branch
  <kbd>r</kbd>: Rename stash
-  <kbd>w</kbd>: View worktree options
  <kbd>&lt;enter&gt;</kbd>: Bekijk gecommite bestanden
  <kbd>/</kbd>: Filter the current view by text
 </pre>
@@ -299,7 +294,6 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_

 <pre>
  <kbd>&lt;c-o&gt;</kbd>: Kopieer commit SHA naar klembord
-  <kbd>w</kbd>: View worktree options
  <kbd>&lt;space&gt;</kbd>: Checkout commit
  <kbd>y</kbd>: Copy commit attribute
  <kbd>o</kbd>: Open commit in browser
@@ -317,7 +311,6 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
 <pre>
  <kbd>&lt;c-o&gt;</kbd>: Kopieer submodule naam naar klembord
  <kbd>&lt;enter&gt;</kbd>: Enter submodule
-  <kbd>&lt;space&gt;</kbd>: Enter submodule
  <kbd>d</kbd>: Remove submodule
  <kbd>u</kbd>: Update submodule
  <kbd>n</kbd>: Voeg nieuwe submodule toe
@@ -335,18 +328,6 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
  <kbd>P</kbd>: Push tag
  <kbd>n</kbd>: Creëer tag
  <kbd>g</kbd>: Bekijk reset opties
-  <kbd>w</kbd>: View worktree options
  <kbd>&lt;enter&gt;</kbd>: Bekijk commits
  <kbd>/</kbd>: Filter the current view by text
 </pre>
-
-## Worktrees
-
-<pre>
-  <kbd>n</kbd>: Create worktree
-  <kbd>&lt;space&gt;</kbd>: Switch to worktree
-  <kbd>&lt;enter&gt;</kbd>: Switch to worktree
-  <kbd>o</kbd>: Open in editor
-  <kbd>d</kbd>: Remove worktree
-  <kbd>/</kbd>: Filter the current view by text
-</pre>
@@ -74,7 +74,6 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
  <kbd>t</kbd>: Odwróć commit
  <kbd>T</kbd>: Tag commit
  <kbd>&lt;c-l&gt;</kbd>: Open log menu
-  <kbd>w</kbd>: View worktree options
  <kbd>&lt;space&gt;</kbd>: Checkout commit
  <kbd>y</kbd>: Copy commit attribute
  <kbd>o</kbd>: Open commit in browser
@@ -113,7 +112,6 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
  <kbd>g</kbd>: Wyświetl opcje resetu
  <kbd>R</kbd>: Rename branch
  <kbd>u</kbd>: Set/Unset upstream
-  <kbd>w</kbd>: View worktree options
  <kbd>&lt;enter&gt;</kbd>: View commits
  <kbd>/</kbd>: Filter the current view by text
 </pre>
@@ -210,7 +208,6 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_

 <pre>
  <kbd>&lt;c-o&gt;</kbd>: Copy commit SHA to clipboard
-  <kbd>w</kbd>: View worktree options
  <kbd>&lt;space&gt;</kbd>: Checkout commit
  <kbd>y</kbd>: Copy commit attribute
  <kbd>o</kbd>: Open commit in browser
@@ -234,7 +231,6 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
  <kbd>d</kbd>: Usuń gałąź
  <kbd>u</kbd>: Set as upstream of checked-out branch
  <kbd>g</kbd>: Wyświetl opcje resetu
-  <kbd>w</kbd>: View worktree options
  <kbd>&lt;enter&gt;</kbd>: View commits
  <kbd>/</kbd>: Filter the current view by text
 </pre>
@@ -273,7 +269,6 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
  <kbd>d</kbd>: Porzuć
  <kbd>n</kbd>: Nowa gałąź
  <kbd>r</kbd>: Rename stash
-  <kbd>w</kbd>: View worktree options
  <kbd>&lt;enter&gt;</kbd>: Przeglądaj pliki commita
  <kbd>/</kbd>: Filter the current view by text
 </pre>
@@ -292,7 +287,6 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_

 <pre>
  <kbd>&lt;c-o&gt;</kbd>: Copy commit SHA to clipboard
-  <kbd>w</kbd>: View worktree options
  <kbd>&lt;space&gt;</kbd>: Checkout commit
  <kbd>y</kbd>: Copy commit attribute
  <kbd>o</kbd>: Open commit in browser
@@ -310,7 +304,6 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
 <pre>
  <kbd>&lt;c-o&gt;</kbd>: Copy submodule name to clipboard
  <kbd>&lt;enter&gt;</kbd>: Enter submodule
-  <kbd>&lt;space&gt;</kbd>: Enter submodule
  <kbd>d</kbd>: Remove submodule
  <kbd>u</kbd>: Update submodule
  <kbd>n</kbd>: Add new submodule
@@ -328,22 +321,10 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
  <kbd>P</kbd>: Push tag
  <kbd>n</kbd>: Create tag
  <kbd>g</kbd>: Wyświetl opcje resetu
-  <kbd>w</kbd>: View worktree options
  <kbd>&lt;enter&gt;</kbd>: View commits
  <kbd>/</kbd>: Filter the current view by text
 </pre>

-## Worktrees
-
-<pre>
-  <kbd>n</kbd>: Create worktree
-  <kbd>&lt;space&gt;</kbd>: Switch to worktree
-  <kbd>&lt;enter&gt;</kbd>: Switch to worktree
-  <kbd>o</kbd>: Open in editor
-  <kbd>d</kbd>: Remove worktree
-  <kbd>/</kbd>: Filter the current view by text
-</pre>
-
 ## Zwykłe

 <pre>
@@ -44,17 +44,6 @@ _Связки клавиш_
  <kbd>[</kbd>: Предыдущая вкладка
 </pre>

-## Worktrees
-
-<pre>
-  <kbd>n</kbd>: Create worktree
-  <kbd>&lt;space&gt;</kbd>: Switch to worktree
-  <kbd>&lt;enter&gt;</kbd>: Switch to worktree
-  <kbd>o</kbd>: Open in editor
-  <kbd>d</kbd>: Remove worktree
-  <kbd>/</kbd>: Filter the current view by text
-</pre>
-
 ## Главная панель (Индексирование)

 <pre>
@@ -120,7 +109,6 @@ _Связки клавиш_

 <pre>
  <kbd>&lt;c-o&gt;</kbd>: Скопировать SHA коммита в буфер обмена
-  <kbd>w</kbd>: View worktree options
  <kbd>&lt;space&gt;</kbd>: Переключить коммит
  <kbd>y</kbd>: Скопировать атрибут коммита
  <kbd>o</kbd>: Открыть коммит в браузере
@@ -156,7 +144,6 @@ _Связки клавиш_
  <kbd>t</kbd>: Отменить коммит
  <kbd>T</kbd>: Пометить коммит тегом
  <kbd>&lt;c-l&gt;</kbd>: Открыть меню журнала
-  <kbd>w</kbd>: View worktree options
  <kbd>&lt;space&gt;</kbd>: Переключить коммит
  <kbd>y</kbd>: Скопировать атрибут коммита
  <kbd>o</kbd>: Открыть коммит в браузере
@@ -188,7 +175,6 @@ _Связки клавиш_
  <kbd>g</kbd>: Просмотреть параметры сброса
  <kbd>R</kbd>: Переименовать ветку
  <kbd>u</kbd>: Установить/убрать upstream-ветку
-  <kbd>w</kbd>: View worktree options
  <kbd>&lt;enter&gt;</kbd>: Просмотреть коммиты
  <kbd>/</kbd>: Filter the current view by text
 </pre>
@@ -212,7 +198,6 @@ _Связки клавиш_

 <pre>
  <kbd>&lt;c-o&gt;</kbd>: Скопировать SHA коммита в буфер обмена
-  <kbd>w</kbd>: View worktree options
  <kbd>&lt;space&gt;</kbd>: Переключить коммит
  <kbd>y</kbd>: Скопировать атрибут коммита
  <kbd>o</kbd>: Открыть коммит в браузере
@@ -230,7 +215,6 @@ _Связки клавиш_
 <pre>
  <kbd>&lt;c-o&gt;</kbd>: Скопировать название подмодуля в буфер обмена
  <kbd>&lt;enter&gt;</kbd>: Ввести подмодуль
-  <kbd>&lt;space&gt;</kbd>: Ввести подмодуль
  <kbd>d</kbd>: Удалить подмодуль
  <kbd>u</kbd>: Обновить подмодуль
  <kbd>n</kbd>: Добавить новый подмодуль
@@ -280,7 +264,6 @@ _Связки клавиш_
  <kbd>P</kbd>: Отправить тег
  <kbd>n</kbd>: Создать тег
  <kbd>g</kbd>: Просмотреть параметры сброса
-  <kbd>w</kbd>: View worktree options
  <kbd>&lt;enter&gt;</kbd>: Просмотреть коммиты
  <kbd>/</kbd>: Filter the current view by text
 </pre>
@@ -296,7 +279,6 @@ _Связки клавиш_
  <kbd>d</kbd>: Удалить ветку
  <kbd>u</kbd>: Установить как upstream-ветку переключённую ветку
  <kbd>g</kbd>: Просмотреть параметры сброса
-  <kbd>w</kbd>: View worktree options
  <kbd>&lt;enter&gt;</kbd>: Просмотреть коммиты
  <kbd>/</kbd>: Filter the current view by text
 </pre>
@@ -346,7 +328,6 @@ _Связки клавиш_
  <kbd>d</kbd>: Удалить припрятанные изменения из хранилища
  <kbd>n</kbd>: Новая ветка
  <kbd>r</kbd>: Переименовать хранилище
-  <kbd>w</kbd>: View worktree options
  <kbd>&lt;enter&gt;</kbd>: Просмотреть файлы выбранного элемента
  <kbd>/</kbd>: Filter the current view by text
 </pre>
@@ -48,7 +48,6 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_

 <pre>
  <kbd>&lt;c-o&gt;</kbd>: 将提交的 SHA 复制到剪贴板
-  <kbd>w</kbd>: View worktree options
  <kbd>&lt;space&gt;</kbd>: 检出提交
  <kbd>y</kbd>: Copy commit attribute
  <kbd>o</kbd>: 在浏览器中打开提交
@@ -61,17 +60,6 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
  <kbd>/</kbd>: Filter the current view by text
 </pre>

-## Worktrees
-
-<pre>
-  <kbd>n</kbd>: Create worktree
-  <kbd>&lt;space&gt;</kbd>: Switch to worktree
-  <kbd>&lt;enter&gt;</kbd>: Switch to worktree
-  <kbd>o</kbd>: Open in editor
-  <kbd>d</kbd>: Remove worktree
-  <kbd>/</kbd>: Filter the current view by text
-</pre>
-
 ## 分支页面

 <pre>
@@ -92,7 +80,6 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
  <kbd>g</kbd>: 查看重置选项
  <kbd>R</kbd>: 重命名分支
  <kbd>u</kbd>: Set/Unset upstream
-  <kbd>w</kbd>: View worktree options
  <kbd>&lt;enter&gt;</kbd>: 查看提交
  <kbd>/</kbd>: Filter the current view by text
 </pre>
@@ -101,7 +88,6 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_

 <pre>
  <kbd>&lt;c-o&gt;</kbd>: 将提交的 SHA 复制到剪贴板
-  <kbd>w</kbd>: View worktree options
  <kbd>&lt;space&gt;</kbd>: 检出提交
  <kbd>y</kbd>: Copy commit attribute
  <kbd>o</kbd>: 在浏览器中打开提交
@@ -119,7 +105,6 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
 <pre>
  <kbd>&lt;c-o&gt;</kbd>: 将子模块名称复制到剪贴板
  <kbd>&lt;enter&gt;</kbd>: 输入子模块
-  <kbd>&lt;space&gt;</kbd>: 输入子模块
  <kbd>d</kbd>: 删除子模块
  <kbd>u</kbd>: 更新子模块
  <kbd>n</kbd>: 添加新的子模块
@@ -152,7 +137,6 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
  <kbd>t</kbd>: 还原提交
  <kbd>T</kbd>: 标签提交
  <kbd>&lt;c-l&gt;</kbd>: 打开日志菜单
-  <kbd>w</kbd>: View worktree options
  <kbd>&lt;space&gt;</kbd>: 检出提交
  <kbd>y</kbd>: Copy commit attribute
  <kbd>o</kbd>: 在浏览器中打开提交
@@ -237,7 +221,6 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
  <kbd>P</kbd>: 推送标签
  <kbd>n</kbd>: 创建标签
  <kbd>g</kbd>: 查看重置选项
-  <kbd>w</kbd>: View worktree options
  <kbd>&lt;enter&gt;</kbd>: 查看提交
  <kbd>/</kbd>: Filter the current view by text
 </pre>
@@ -320,7 +303,6 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
  <kbd>d</kbd>: 删除
  <kbd>n</kbd>: 新分支
  <kbd>r</kbd>: Rename stash
-  <kbd>w</kbd>: View worktree options
  <kbd>&lt;enter&gt;</kbd>: 查看提交的文件
  <kbd>/</kbd>: Filter the current view by text
 </pre>
@@ -336,7 +318,6 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
  <kbd>d</kbd>: 删除分支
  <kbd>u</kbd>: 设置为检出分支的上游
  <kbd>g</kbd>: 查看重置选项
-  <kbd>w</kbd>: View worktree options
  <kbd>&lt;enter&gt;</kbd>: 查看提交
  <kbd>/</kbd>: Filter the current view by text
 </pre>
@@ -48,7 +48,6 @@ _說明：`<c-b>` 表示 Ctrl+B、`<a-b>` 表示 Alt+B，`B`表示 Shift+B_

 <pre>
  <kbd>&lt;c-o&gt;</kbd>: 複製提交 SHA 到剪貼簿
-  <kbd>w</kbd>: View worktree options
  <kbd>&lt;space&gt;</kbd>: 檢出提交
  <kbd>y</kbd>: 複製提交屬性
  <kbd>o</kbd>: 在瀏覽器中開啟提交
@@ -61,17 +60,6 @@ _說明：`<c-b>` 表示 Ctrl+B、`<a-b>` 表示 Alt+B，`B`表示 Shift+B_
  <kbd>/</kbd>: Filter the current view by text
 </pre>

-## Worktrees
-
-<pre>
-  <kbd>n</kbd>: Create worktree
-  <kbd>&lt;space&gt;</kbd>: Switch to worktree
-  <kbd>&lt;enter&gt;</kbd>: Switch to worktree
-  <kbd>o</kbd>: Open in editor
-  <kbd>d</kbd>: Remove worktree
-  <kbd>/</kbd>: Filter the current view by text
-</pre>
-
 ## 主視窗 (一般)

 <pre>
@@ -145,7 +133,6 @@ _說明：`<c-b>` 表示 Ctrl+B、`<a-b>` 表示 Alt+B，`B`表示 Shift+B_

 <pre>
  <kbd>&lt;c-o&gt;</kbd>: 複製提交 SHA 到剪貼簿
-  <kbd>w</kbd>: View worktree options
  <kbd>&lt;space&gt;</kbd>: 檢出提交
  <kbd>y</kbd>: 複製提交屬性
  <kbd>o</kbd>: 在瀏覽器中開啟提交
@@ -163,7 +150,6 @@ _說明：`<c-b>` 表示 Ctrl+B、`<a-b>` 表示 Alt+B，`B`表示 Shift+B_
 <pre>
  <kbd>&lt;c-o&gt;</kbd>: 複製子模組名稱到剪貼簿
  <kbd>&lt;enter&gt;</kbd>: 進入子模組
-  <kbd>&lt;space&gt;</kbd>: 進入子模組
  <kbd>d</kbd>: 移除子模組
  <kbd>u</kbd>: 更新子模組
  <kbd>n</kbd>: 新增子模組
@@ -196,7 +182,6 @@ _說明：`<c-b>` 表示 Ctrl+B、`<a-b>` 表示 Alt+B，`B`表示 Shift+B_
  <kbd>t</kbd>: 還原提交
  <kbd>T</kbd>: 打標籤到提交
  <kbd>&lt;c-l&gt;</kbd>: 開啟記錄選單
-  <kbd>w</kbd>: View worktree options
  <kbd>&lt;space&gt;</kbd>: 檢出提交
  <kbd>y</kbd>: 複製提交屬性
  <kbd>o</kbd>: 在瀏覽器中開啟提交
@@ -238,7 +223,6 @@ _說明：`<c-b>` 表示 Ctrl+B、`<a-b>` 表示 Alt+B，`B`表示 Shift+B_
  <kbd>d</kbd>: 捨棄
  <kbd>n</kbd>: 新分支
  <kbd>r</kbd>: 重新命名收藏
-  <kbd>w</kbd>: View worktree options
  <kbd>&lt;enter&gt;</kbd>: 檢視所選項目的檔案
  <kbd>/</kbd>: Filter the current view by text
 </pre>
@@ -263,7 +247,6 @@ _說明：`<c-b>` 表示 Ctrl+B、`<a-b>` 表示 Alt+B，`B`表示 Shift+B_
  <kbd>g</kbd>: 檢視重設選項
  <kbd>R</kbd>: 重新命名分支
  <kbd>u</kbd>: 設定/取消設定上游
-  <kbd>w</kbd>: View worktree options
  <kbd>&lt;enter&gt;</kbd>: 檢視提交
  <kbd>/</kbd>: Filter the current view by text
 </pre>
@@ -276,7 +259,6 @@ _說明：`<c-b>` 表示 Ctrl+B、`<a-b>` 表示 Alt+B，`B`表示 Shift+B_
  <kbd>P</kbd>: 推送標籤
  <kbd>n</kbd>: 建立標籤
  <kbd>g</kbd>: 檢視重設選項
-  <kbd>w</kbd>: View worktree options
  <kbd>&lt;enter&gt;</kbd>: 檢視提交
  <kbd>/</kbd>: Filter the current view by text
 </pre>
@@ -346,7 +328,6 @@ _說明：`<c-b>` 表示 Ctrl+B、`<a-b>` 表示 Alt+B，`B`表示 Shift+B_
  <kbd>d</kbd>: 刪除分支
  <kbd>u</kbd>: 將此分支設為當前分支之上游
  <kbd>g</kbd>: 檢視重設選項
-  <kbd>w</kbd>: View worktree options
  <kbd>&lt;enter&gt;</kbd>: 檢視提交
  <kbd>/</kbd>: Filter the current view by text
 </pre>
@@ -18,11 +18,10 @@ require (
 	github.com/integrii/flaggy v1.4.0
 	github.com/jesseduffield/generics v0.0.0-20220320043834-727e535cbe68
 	github.com/jesseduffield/go-git/v5 v5.1.2-0.20221018185014-fdd53fef665d
-	github.com/jesseduffield/gocui v0.3.1-0.20230723014157-03e858e46144
+	github.com/jesseduffield/gocui v0.3.1-0.20230710004407-9bbfd873713b
 	github.com/jesseduffield/kill v0.0.0-20220618033138-bfbe04675d10
 	github.com/jesseduffield/lazycore v0.0.0-20221012050358-03d2e40243c5
 	github.com/jesseduffield/minimal/gitignore v0.3.3-0.20211018110810-9cde264e6b1e
-	github.com/jesseduffield/yaml v2.1.0+incompatible
 	github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0
 	github.com/kyokomi/emoji/v2 v2.2.8
 	github.com/lucasb-eyer/go-colorful v1.2.0
@@ -64,9 +63,8 @@ require (
 	github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect
 	github.com/rivo/uniseg v0.4.4 // indirect
 	github.com/sergi/go-diff v1.1.0 // indirect
-	github.com/spf13/afero v1.9.5 // indirect
 	github.com/xanzy/ssh-agent v0.2.1 // indirect
-	golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa // indirect
+	golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect
 	golang.org/x/exp v0.0.0-20220318154914-8dddf5d87bd8 // indirect
 	golang.org/x/net v0.7.0 // indirect
 	golang.org/x/sys v0.10.0 // indirect
@@ -1,43 +1,3 @@
-cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
-cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU=
-cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY=
-cloud.google.com/go v0.44.3/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY=
-cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc=
-cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0=
-cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To=
-cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4=
-cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M=
-cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc=
-cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk=
-cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs=
-cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc=
-cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY=
-cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI=
-cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk=
-cloud.google.com/go v0.75.0/go.mod h1:VGuuCn7PG0dwsd5XPVm2Mm3wlh3EL55/79EKB6hlPTY=
-cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
-cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
-cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc=
-cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg=
-cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc=
-cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ=
-cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
-cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=
-cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
-cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=
-cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA=
-cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU=
-cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
-cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos=
-cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
-cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
-cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
-cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo=
-dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
-github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/OpenPeeDeeP/xdg v1.0.0 h1:UDLmNjCGFZZCaVMB74DqYEtXkHxnTxcr4FeJVF9uCn8=
 github.com/OpenPeeDeeP/xdg v1.0.0/go.mod h1:tMoSueLQlMf0TCldjrJLNIjAc5qAOIcHt5REi88/Ygo=
 github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7 h1:uSoVVbwJiQipAclBbw+8quDsfcvFjOpI5iCf4p/cqCs=
@@ -51,18 +11,10 @@ github.com/atotto/clipboard v0.1.4/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn
 github.com/aybabtme/humanlog v0.4.1 h1:D8d9um55rrthJsP8IGSHBcti9lTb/XknmDAX6Zy8tek=
 github.com/aybabtme/humanlog v0.4.1/go.mod h1:B0bnQX4FTSU3oftPMTTPvENCy8LqixLDvYJA9TUCAGo=
 github.com/aybabtme/rgbterm v0.0.0-20170906152045-cc83f3b3ce59/go.mod h1:q/89r3U2H7sSsE2t6Kca0lfwTK8JdoNGS/yzM/4iH5I=
-github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
-github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
-github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
-github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
 github.com/cli/safeexec v1.0.0 h1:0VngyaIyqACHdcMNWfo6+KdUYnqEr2Sg+bSP1pdF+dI=
 github.com/cli/safeexec v1.0.0/go.mod h1:Z/D4tTN8Vs5gXYHDCbaM1S/anmEDnJb1iW0+EJ5zx3Q=
-github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cloudfoundry/jibber_jabber v0.0.0-20151120183258-bcc4c8345a21 h1:tuijfIjZyjZaHq9xDUh0tNitwXshJpbLkqMOJv4H3do=
 github.com/cloudfoundry/jibber_jabber v0.0.0-20151120183258-bcc4c8345a21/go.mod h1:po7NpZ/QiTKzBKyrsEAxwnTamCoh8uDk/egRpQ7siIc=
-github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
-github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
-github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/creack/pty v1.1.11 h1:07n33Z8lZxZ2qwegKbObQohDhXDQxiMMz1NOUGYlesw=
 github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
@@ -72,12 +24,6 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/emirpasic/gods v1.12.0 h1:QAUIPSaCu4G+POclxeqb3F+WPpdKqFGlw36+yOzGlrg=
 github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o=
-github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
-github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
-github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
-github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po=
-github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
-github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/fatih/color v1.7.1-0.20180516100307-2d684516a886/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/fatih/color v1.9.0 h1:8xPHl4/q1VyqGIPif1F+1V3Y3lSmrq01EabUW3CoW5s=
 github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
@@ -102,78 +48,19 @@ github.com/go-git/go-billy/v5 v5.0.0 h1:7NQHvd9FVid8VL4qVUMm8XifBK+2xCoZ2lSk0agR
 github.com/go-git/go-billy/v5 v5.0.0/go.mod h1:pmpqyWchKfYfrkb/UVH4otLvyi/5gJlGI4Hb3ZqZ3W0=
 github.com/go-git/go-git-fixtures/v4 v4.0.2-0.20200613231340-f56387b50c12 h1:PbKy9zOy4aAKrJ5pibIRpVO2BXnK1Tlcg+caKI7Ox5M=
 github.com/go-git/go-git-fixtures/v4 v4.0.2-0.20200613231340-f56387b50c12/go.mod h1:m+ICp2rF3jDhFgEZ/8yziagdT1C+ZpZcrJjappBCDSw=
-github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
-github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
-github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
 github.com/go-logfmt/logfmt v0.5.0 h1:TrB8swr/68K7m9CcGut2g3UOihhbcbiMAYiuTXdEih4=
 github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
 github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
 github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
-github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
-github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
-github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
-github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
-github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
-github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
-github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
-github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
-github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
-github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
-github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
-github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
-github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
-github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
-github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
-github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
-github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
-github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
-github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
-github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
-github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ=
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
-github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
-github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
-github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
-github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
-github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
-github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
-github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
-github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g=
 github.com/gookit/color v1.4.2 h1:tXy44JFSFkKnELV6WaMo/lLfu/meqITX3iAV52do7lk=
 github.com/gookit/color v1.4.2/go.mod h1:fqRyamkC1W8uxl+lxCQxOT09l/vYfZ+QeiX3rKQHCoQ=
-github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
-github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
-github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
-github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/imdario/mergo v0.3.9/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
 github.com/imdario/mergo v0.3.11 h1:3tnifQM4i+fbajXKBHXWEH+KvNHqojZ778UH75j3bGA=
 github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
@@ -185,28 +72,22 @@ github.com/jesseduffield/generics v0.0.0-20220320043834-727e535cbe68 h1:EQP2Tv8T
 github.com/jesseduffield/generics v0.0.0-20220320043834-727e535cbe68/go.mod h1:+LLj9/WUPAP8LqCchs7P+7X0R98HiFujVFANdNaxhGk=
 github.com/jesseduffield/go-git/v5 v5.1.2-0.20221018185014-fdd53fef665d h1:bO+OmbreIv91rCe8NmscRwhFSqkDJtzWCPV4Y+SQuXE=
 github.com/jesseduffield/go-git/v5 v5.1.2-0.20221018185014-fdd53fef665d/go.mod h1:nGNEErzf+NRznT+N2SWqmHnDnF9aLgANB1CUNEan09o=
-github.com/jesseduffield/gocui v0.3.1-0.20230723014157-03e858e46144 h1:gwy5JzP6+PhcPFG1obkUSLGcTkUY88sLKlCPOFjwtak=
-github.com/jesseduffield/gocui v0.3.1-0.20230723014157-03e858e46144/go.mod h1:dJ/BEUt3OWtaRg/PmuJWendRqREhre9JQ1SLvqrVJ8s=
+github.com/jesseduffield/gocui v0.3.1-0.20230710004407-9bbfd873713b h1:8FmmdaYHes1m3oNyNdS+VIgkgkFpNZAWuwTnvp0tG14=
+github.com/jesseduffield/gocui v0.3.1-0.20230710004407-9bbfd873713b/go.mod h1:dJ/BEUt3OWtaRg/PmuJWendRqREhre9JQ1SLvqrVJ8s=
 github.com/jesseduffield/kill v0.0.0-20220618033138-bfbe04675d10 h1:jmpr7KpX2+2GRiE91zTgfq49QvgiqB0nbmlwZ8UnOx0=
 github.com/jesseduffield/kill v0.0.0-20220618033138-bfbe04675d10/go.mod h1:aA97kHeNA+sj2Hbki0pvLslmE4CbDyhBeSSTUUnOuVo=
 github.com/jesseduffield/lazycore v0.0.0-20221012050358-03d2e40243c5 h1:CDuQmfOjAtb1Gms6a1p5L2P8RhbLUq5t8aL7PiQd2uY=
 github.com/jesseduffield/lazycore v0.0.0-20221012050358-03d2e40243c5/go.mod h1:qxN4mHOAyeIDLP7IK7defgPClM/z1Kze8VVQiaEjzsQ=
 github.com/jesseduffield/minimal/gitignore v0.3.3-0.20211018110810-9cde264e6b1e h1:uw/oo+kg7t/oeMs6sqlAwr85ND/9cpO3up3VxphxY0U=
 github.com/jesseduffield/minimal/gitignore v0.3.3-0.20211018110810-9cde264e6b1e/go.mod h1:u60qdFGXRd36jyEXxetz0vQceQIxzI13lIo3EFUDf4I=
-github.com/jesseduffield/yaml v2.1.0+incompatible h1:HWQJ1gIv2zHKbDYNp0Jwjlj24K8aqpFHnMCynY1EpmE=
-github.com/jesseduffield/yaml v2.1.0+incompatible/go.mod h1:w0xGhOSIJCGYYW+hnFPTutCy5aACpkcwbmORt5axGqk=
 github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
-github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
-github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
 github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 h1:iQTw/8FWTuc7uiaSepXwyf3o52HaUYcV+Tu66S3F5GA=
 github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8=
 github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd h1:Coekwdh0v2wtGp9Gmz1Ze3eVRAWJMLokvN3QjdzCHLY=
 github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
-github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3enTrPXyIXCl+2iCXH/aMAp9s=
 github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515 h1:T+h1c/A9Gawja4Y9mFVWj2vyii2bbUNDw3kt9VxK2EY=
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
@@ -248,18 +129,14 @@ github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 h1:q2e307iGHPdTGp
 github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5/go.mod h1:jvVRKCrJTQWu0XVbaOlby/2lO20uSCHEMzzplHXte1o=
 github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg=
 github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rivo/uniseg v0.4.3/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
 github.com/rivo/uniseg v0.4.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis=
 github.com/rivo/uniseg v0.4.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
-github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/sahilm/fuzzy v0.1.0 h1:FzWGaw2Opqyu+794ZQ9SYifWv2EIXpwP4q8dY1kDAwI=
 github.com/sahilm/fuzzy v0.1.0/go.mod h1:VFvziUEIMCrT6A6tw2RFIXPXXmzXbOsSHF0DOI8ZK9Y=
 github.com/samber/lo v1.31.0 h1:Sfa+/064Tdo4SvlohQUQzBhgSer9v/coGvKQI/XLWAM=
@@ -272,8 +149,6 @@ github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0=
 github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
 github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
-github.com/spf13/afero v1.9.5 h1:stMpOSZFs//0Lv29HduCmli3GUfpFoF3Y1Q/aXj/wVM=
-github.com/spf13/afero v1.9.5/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ=
 github.com/spkg/bom v0.0.0-20160624110644-59b7046e48ad h1:fiWzISvDn0Csy5H0iwgAuJGQTUpVfEMJJd4nRFXogbc=
 github.com/spkg/bom v0.0.0-20160624110644-59b7046e48ad/go.mod h1:qLr4V1qq6nMqFKkMo8ZTx3f+BZEkzsRUY10Xsm2mwU0=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
@@ -283,7 +158,6 @@ github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSS
 github.com/stretchr/testify v0.0.0-20161117074351-18a02ba4a312/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
@@ -295,162 +169,37 @@ github.com/xanzy/ssh-agent v0.2.1 h1:TCbipTQL2JiiCprBWx9frJ2eJlCYT00NmctrHxVAr70
 github.com/xanzy/ssh-agent v0.2.1/go.mod h1:mLlQY/MoOhWBj+gOGMQkOeiEvkx+8pJSI+0Bx9h2kr4=
 github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 h1:QldyIu/L63oPpyvQmHgvgickp1Yw510KJOqX7H24mg8=
 github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778/go.mod h1:2MuV+tbUrU1zIOPMxZ5EncGwgmMJsa+9ucAQZXxsObs=
-github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
-go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
-go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
-go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
-go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
-go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
-go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
 golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 h1:7I4JAnoQBe7ZtJcBaYHi5UtiO8tQHbUSXxL+pnGRANg=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa h1:zuSxTR4o9y82ebqCUJYNGJbGPo6sKVl54f/TVDObg1c=
-golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
-golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek=
-golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY=
-golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
-golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
-golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
-golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
-golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
 golang.org/x/exp v0.0.0-20220318154914-8dddf5d87bd8 h1:s/+U+w0teGzcoH2mdIlFQ6KfVKGaYpgyGdUefZrn9TU=
 golang.org/x/exp v0.0.0-20220318154914-8dddf5d87bd8/go.mod h1:lgLbSvA5ygNOMpwM/9anMpWVlVJ7Z+cHWq/eFuinpGE=
-golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
-golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
-golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
-golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
-golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs=
-golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
-golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
-golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
-golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
-golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
-golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
-golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
-golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
-golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
-golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
-golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
-golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
-golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
-golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g=
 golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
-golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20170407050850-f3918c30c5c2/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190221075227-b4e8571b14e0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -466,166 +215,22 @@ golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuX
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/term v0.10.0 h1:3R7pNqamzBraeqj/Tj8qt1aQ2HpmlC+Cx/qL/7hn4/c=
 golang.org/x/term v0.10.0/go.mod h1:lpqdcUyK/oCiQxvxVrppt5ggO2KCZ5QblwqPnfZ6d5o=
-golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4=
 golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
-golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
-golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
-golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
-golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
-golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
-golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
-golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
-golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE=
-golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
-google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
-google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
-google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
-google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
-google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
-google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
-google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
-google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
-google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM=
-google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc=
-google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg=
-google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE=
-google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8=
-google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
-google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
-google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
-google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
-google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
-google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
-google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
-google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
-google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8=
-google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA=
-google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U=
-google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA=
-google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
-google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
-google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
-google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
-google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
-google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60=
-google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
-google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
-google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
-google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
-google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
-google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8=
-google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
-google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
-google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
-google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
-google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
-google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
-google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=
-google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/ozeidan/fuzzy-patricia.v3 v3.0.0 h1:KzcWKJ0nMAmGoBhYVMnkWc1rXjB42lKy5aIys4TdLOA=
@@ -641,13 +246,3 @@ gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
-honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
-honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
-rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
-rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
-rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
@@ -11,7 +11,6 @@ import (

 	"github.com/go-errors/errors"
 	"github.com/sirupsen/logrus"
-	"github.com/spf13/afero"

 	"github.com/jesseduffield/generics/slices"
 	appTypes "github.com/jesseduffield/lazygit/pkg/app/types"
@@ -76,7 +75,6 @@ func NewCommon(config config.AppConfigurer) (*common.Common, error) {
 		Tr:         tr,
 		UserConfig: userConfig,
 		Debug:      config.GetDebug(),
-		Fs:         afero.NewOsFs(),
 	}, nil
 }

@@ -76,10 +76,7 @@ func Start(buildInfo *BuildInfo, integrationTest integrationTypes.IntegrationTes
 	}

 	if cliArgs.WorkTree != "" {
-		err := os.Chdir(cliArgs.WorkTree)
-		if err != nil {
-			log.Fatalf("Failed to change directory to %s: %v", cliArgs.WorkTree, err)
-		}
+		env.SetGitWorkTreeEnv(cliArgs.WorkTree)
 	}

 	if cliArgs.GitDir != "" {
@@ -101,7 +101,7 @@ func localisedTitle(tr *i18n.TranslationSet, str string) string {
 		"reflogCommits":     tr.ReflogCommitsTitle,
 		"tags":              tr.TagsTitle,
 		"commitFiles":       tr.CommitFilesTitle,
-		"commitMessage":     tr.CommitSummaryTitle,
+		"commitMessage":     tr.CommitMessageTitle,
 		"commitDescription": tr.CommitDescriptionTitle,
 		"commits":           tr.CommitsTitle,
 		"confirmation":      tr.ConfirmationTitle,
@@ -2,13 +2,11 @@ package commands

 import (
 	"os"
-	"path"
 	"path/filepath"
 	"strings"

 	"github.com/go-errors/errors"
 	"github.com/sasha-s/go-deadlock"
-	"github.com/spf13/afero"

 	gogit "github.com/jesseduffield/go-git/v5"
 	"github.com/jesseduffield/lazygit/pkg/commands/git_commands"
@@ -41,7 +39,6 @@ type GitCommand struct {
 	Bisect      *git_commands.BisectCommands
 	Worktree    *git_commands.WorktreeCommands
 	Version     *git_commands.GitVersion
-	RepoPaths   *git_commands.RepoPaths

 	Loaders Loaders
 }
@@ -65,49 +62,17 @@ func NewGitCommand(
 	gitConfig git_config.IGitConfig,
 	syncMutex *deadlock.Mutex,
 ) (*GitCommand, error) {
-	currentPath, err := os.Getwd()
-	if err != nil {
-		return nil, utils.WrapError(err)
+	if err := navigateToRepoRootDirectory(os.Stat, os.Chdir); err != nil {
+		return nil, err
 	}

-	// converting to forward slashes for the sake of windows (which uses backwards slashes). We want everything
-	// to have forward slashes internally
-	currentPath = filepath.ToSlash(currentPath)
-
-	gitDir := env.GetGitDirEnv()
-	if gitDir != "" {
-		// we've been given the git directory explicitly so no need to navigate to it
-		_, err := cmn.Fs.Stat(gitDir)
-		if err != nil {
-			return nil, utils.WrapError(err)
-		}
-	} else {
-		// we haven't been given the git dir explicitly so we assume it's in the current working directory as `.git/` (or an ancestor directory)
-
-		rootDirectory, err := findWorktreeRoot(cmn.Fs, currentPath)
-		if err != nil {
-			return nil, utils.WrapError(err)
-		}
-		currentPath = rootDirectory
-		err = os.Chdir(rootDirectory)
-		if err != nil {
-			return nil, utils.WrapError(err)
-		}
+	repo, err := setupRepository(gogit.PlainOpenWithOptions, gogit.PlainOpenOptions{DetectDotGit: false, EnableDotGitCommonDir: true}, cmn.Tr.GitconfigParseErr)
+	if err != nil {
+		return nil, err
 	}

-	repoPaths, err := git_commands.GetRepoPaths(cmn.Fs, currentPath)
+	dotGitDir, err := findDotGitDir(os.Stat, os.ReadFile)
 	if err != nil {
-		return nil, errors.Errorf("Error getting repo paths: %v", err)
-	}
-
-	repository, err := gogit.PlainOpenWithOptions(
-		repoPaths.WorktreeGitDirPath(),
-		&gogit.PlainOpenOptions{DetectDotGit: false, EnableDotGitCommonDir: true},
-	)
-	if err != nil {
-		if strings.Contains(err.Error(), `unquoted '\' must be followed by new line`) {
-			return nil, errors.New(cmn.Tr.GitconfigParseErr)
-		}
 		return nil, err
 	}

@@ -116,8 +81,8 @@ func NewGitCommand(
 		version,
 		osCommand,
 		gitConfig,
-		repoPaths,
-		repository,
+		dotGitDir,
+		repo,
 		syncMutex,
 	), nil
 }
@@ -127,7 +92,7 @@ func NewGitCommandAux(
 	version *git_commands.GitVersion,
 	osCommand *oscommands.OSCommand,
 	gitConfig git_config.IGitConfig,
-	repoPaths *git_commands.RepoPaths,
+	dotGitDir string,
 	repo *gogit.Repository,
 	syncMutex *deadlock.Mutex,
 ) *GitCommand {
@@ -140,9 +105,9 @@ func NewGitCommandAux(
 	// common ones are: cmn, osCommand, dotGitDir, configCommands
 	configCommands := git_commands.NewConfigCommands(cmn, gitConfig, repo)

-	gitCommon := git_commands.NewGitCommon(cmn, version, cmd, osCommand, repoPaths, repo, configCommands, syncMutex)
+	fileLoader := git_commands.NewFileLoader(cmn, cmd, configCommands)

-	fileLoader := git_commands.NewFileLoader(gitCommon, cmd, configCommands)
+	gitCommon := git_commands.NewGitCommon(cmn, version, cmd, osCommand, dotGitDir, repo, configCommands, syncMutex)
 	statusCommands := git_commands.NewStatusCommands(gitCommon)
 	flowCommands := git_commands.NewFlowCommands(gitCommon)
 	remoteCommands := git_commands.NewRemoteCommands(gitCommon)
@@ -169,10 +134,10 @@ func NewGitCommandAux(

 	branchLoader := git_commands.NewBranchLoader(cmn, cmd, branchCommands.CurrentBranchInfo, configCommands)
 	commitFileLoader := git_commands.NewCommitFileLoader(cmn, cmd)
-	commitLoader := git_commands.NewCommitLoader(cmn, cmd, statusCommands.RebaseMode, gitCommon)
+	commitLoader := git_commands.NewCommitLoader(cmn, cmd, dotGitDir, statusCommands.RebaseMode, gitCommon)
 	reflogCommitLoader := git_commands.NewReflogCommitLoader(cmn, cmd)
 	remoteLoader := git_commands.NewRemoteLoader(cmn, cmd, repo.Remotes)
-	worktreeLoader := git_commands.NewWorktreeLoader(gitCommon)
+	worktreeLoader := git_commands.NewWorktreeLoader(cmn, cmd)
 	stashLoader := git_commands.NewStashLoader(cmn, cmd)
 	tagLoader := git_commands.NewTagLoader(cmn, cmd)

@@ -207,36 +172,118 @@ func NewGitCommandAux(
 			StashLoader:        stashLoader,
 			TagLoader:          tagLoader,
 		},
-		RepoPaths: repoPaths,
 	}
 }

-// this returns the root of the current worktree. So if you start lazygit from within
-// a subdirectory of the worktree, it will start in the context of the root of that worktree
-func findWorktreeRoot(fs afero.Fs, currentPath string) (string, error) {
+func navigateToRepoRootDirectory(stat func(string) (os.FileInfo, error), chdir func(string) error) error {
+	gitDir := env.GetGitDirEnv()
+	if gitDir != "" {
+		// we've been given the git directory explicitly so no need to navigate to it
+		_, err := stat(gitDir)
+		if err != nil {
+			return utils.WrapError(err)
+		}
+
+		return nil
+	}
+
+	// we haven't been given the git dir explicitly so we assume it's in the current working directory as `.git/` (or an ancestor directory)
+
 	for {
-		// we don't care if .git is a directory or a file: either is okay.
-		_, err := fs.Stat(path.Join(currentPath, ".git"))
+		_, err := stat(".git")

 		if err == nil {
-			return currentPath, nil
+			return nil
 		}

 		if !os.IsNotExist(err) {
-			return "", utils.WrapError(err)
+			return utils.WrapError(err)
 		}

-		currentPath = path.Dir(currentPath)
+		if err = chdir(".."); err != nil {
+			return utils.WrapError(err)
+		}

-		atRoot := currentPath == path.Dir(currentPath)
+		currentPath, err := os.Getwd()
+		if err != nil {
+			return err
+		}
+
+		atRoot := currentPath == filepath.Dir(currentPath)
 		if atRoot {
 			// we should never really land here: the code that creates GitCommand should
 			// verify we're in a git directory
-			return "", errors.New("Must open lazygit in a git repository")
+			return errors.New("Must open lazygit in a git repository")
 		}
 	}
 }

+// resolvePath takes a path containing a symlink and returns the true path
+func resolvePath(path string) (string, error) {
+	l, err := os.Lstat(path)
+	if err != nil {
+		return "", err
+	}
+
+	if l.Mode()&os.ModeSymlink == 0 {
+		return path, nil
+	}
+
+	return filepath.EvalSymlinks(path)
+}
+
+func setupRepository(openGitRepository func(string, *gogit.PlainOpenOptions) (*gogit.Repository, error), options gogit.PlainOpenOptions, gitConfigParseErrorStr string) (*gogit.Repository, error) {
+	unresolvedPath := env.GetGitDirEnv()
+	if unresolvedPath == "" {
+		var err error
+		unresolvedPath, err = os.Getwd()
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	path, err := resolvePath(unresolvedPath)
+	if err != nil {
+		return nil, err
+	}
+
+	repository, err := openGitRepository(path, &options)
+	if err != nil {
+		if strings.Contains(err.Error(), `unquoted '\' must be followed by new line`) {
+			return nil, errors.New(gitConfigParseErrorStr)
+		}
+
+		return nil, err
+	}
+
+	return repository, err
+}
+
+func findDotGitDir(stat func(string) (os.FileInfo, error), readFile func(filename string) ([]byte, error)) (string, error) {
+	if env.GetGitDirEnv() != "" {
+		return env.GetGitDirEnv(), nil
+	}
+
+	f, err := stat(".git")
+	if err != nil {
+		return "", err
+	}
+
+	if f.IsDir() {
+		return ".git", nil
+	}
+
+	fileBytes, err := readFile(".git")
+	if err != nil {
+		return "", err
+	}
+	fileContent := string(fileBytes)
+	if !strings.HasPrefix(fileContent, "gitdir: ") {
+		return "", errors.New(".git is a file which suggests we are in a submodule or a worktree but the file's contents do not contain a gitdir pointing to the actual .git directory")
+	}
+	return strings.TrimSpace(strings.TrimPrefix(fileContent, "gitdir: ")), nil
+}
+
 func VerifyInGitRepo(osCommand *oscommands.OSCommand) error {
 	return osCommand.Cmd.New(git_commands.NewGitCmd("rev-parse").Arg("--git-dir").ToArgv()).DontLog().Run()
 }
@@ -19,16 +19,12 @@ func NewBisectCommands(gitCommon *GitCommon) *BisectCommands {
 // This command is pretty cheap to run so we're not storing the result anywhere.
 // But if it becomes problematic we can chang that.
 func (self *BisectCommands) GetInfo() *BisectInfo {
-	return self.GetInfoForGitDir(self.repoPaths.WorktreeGitDirPath())
-}
-
-func (self *BisectCommands) GetInfoForGitDir(gitDir string) *BisectInfo {
 	var err error
 	info := &BisectInfo{started: false, log: self.Log, newTerm: "bad", oldTerm: "good"}
 	// we return nil if we're not in a git bisect session.
 	// we know we're in a session by the presence of a .git/BISECT_START file

-	bisectStartPath := filepath.Join(gitDir, "BISECT_START")
+	bisectStartPath := filepath.Join(self.dotGitDir, "BISECT_START")
 	exists, err := self.os.FileExists(bisectStartPath)
 	if err != nil {
 		self.Log.Infof("error getting git bisect info: %s", err.Error())
@@ -48,7 +44,7 @@ func (self *BisectCommands) GetInfoForGitDir(gitDir string) *BisectInfo {
 	info.started = true
 	info.start = strings.TrimSpace(string(startContent))

-	termsContent, err := os.ReadFile(filepath.Join(gitDir, "BISECT_TERMS"))
+	termsContent, err := os.ReadFile(filepath.Join(self.dotGitDir, "BISECT_TERMS"))
 	if err != nil {
 		// old git versions won't have this file so we default to bad/good
 	} else {
@@ -57,7 +53,7 @@ func (self *BisectCommands) GetInfoForGitDir(gitDir string) *BisectInfo {
 		info.oldTerm = splitContent[1]
 	}

-	bisectRefsDir := filepath.Join(gitDir, "refs", "bisect")
+	bisectRefsDir := filepath.Join(self.dotGitDir, "refs", "bisect")
 	files, err := os.ReadDir(bisectRefsDir)
 	if err != nil {
 		self.Log.Infof("error getting git bisect info: %s", err.Error())
@@ -89,7 +85,7 @@ func (self *BisectCommands) GetInfoForGitDir(gitDir string) *BisectInfo {
 		info.statusMap[sha] = status
 	}

-	currentContent, err := os.ReadFile(filepath.Join(gitDir, "BISECT_EXPECTED_REV"))
+	currentContent, err := os.ReadFile(filepath.Join(self.dotGitDir, "BISECT_EXPECTED_REV"))
 	if err != nil {
 		self.Log.Infof("error getting git bisect info: %s", err.Error())
 		return info
@@ -81,12 +81,6 @@ outer:
 		}
 	}

-	// Sort branches that don't have a recency value alphabetically
-	// (we're really doing this for the sake of deterministic behaviour across git versions)
-	slices.SortFunc(branches, func(a *models.Branch, b *models.Branch) bool {
-		return a.Name < b.Name
-	})
-
 	branches = slices.Prepend(branches, branchesWithRecency...)

 	foundHead := false
@@ -50,13 +50,13 @@ func (self *CommitCommands) ResetToCommit(sha string, strength string, envVars [
 		Run()
 }

-func (self *CommitCommands) CommitCmdObj(summary string, description string) oscommands.ICmdObj {
-	messageArgs := self.commitMessageArgs(summary, description)
+func (self *CommitCommands) CommitCmdObj(message string) oscommands.ICmdObj {
+	messageArgs := self.commitMessageArgs(message)

 	skipHookPrefix := self.UserConfig.Git.SkipHookPrefix

 	cmdArgs := NewGitCmd("commit").
-		ArgIf(skipHookPrefix != "" && strings.HasPrefix(summary, skipHookPrefix), "--no-verify").
+		ArgIf(skipHookPrefix != "" && strings.HasPrefix(message, skipHookPrefix), "--no-verify").
 		ArgIf(self.signoffFlag() != "", self.signoffFlag()).
 		Arg(messageArgs...).
 		ToArgv()
@@ -69,8 +69,8 @@ func (self *CommitCommands) RewordLastCommitInEditorCmdObj() oscommands.ICmdObj
 }

 // RewordLastCommit rewords the topmost commit with the given message
-func (self *CommitCommands) RewordLastCommit(summary string, description string) error {
-	messageArgs := self.commitMessageArgs(summary, description)
+func (self *CommitCommands) RewordLastCommit(message string) error {
+	messageArgs := self.commitMessageArgs(message)

 	cmdArgs := NewGitCmd("commit").
 		Arg("--allow-empty", "--amend", "--only").
@@ -80,8 +80,9 @@ func (self *CommitCommands) RewordLastCommit(summary string, description string)
 	return self.cmd.New(cmdArgs).Run()
 }

-func (self *CommitCommands) commitMessageArgs(summary string, description string) []string {
-	args := []string{"-m", summary}
+func (self *CommitCommands) commitMessageArgs(message string) []string {
+	msg, description, _ := strings.Cut(message, "\n")
+	args := []string{"-m", msg}

 	if description != "" {
 		args = append(args, "-m", description)
@@ -107,6 +108,14 @@ func (self *CommitCommands) signoffFlag() string {
 	}
 }

+// Get the subject of the HEAD commit
+func (self *CommitCommands) GetHeadCommitMessage() (string, error) {
+	cmdArgs := NewGitCmd("log").Arg("-1", "--pretty=%s").ToArgv()
+
+	message, err := self.cmd.New(cmdArgs).DontLog().RunWithOutput()
+	return strings.TrimSpace(message), err
+}
+
 func (self *CommitCommands) GetCommitMessage(commitSha string) (string, error) {
 	cmdArgs := NewGitCmd("rev-list").
 		Arg("--format=%B", "--max-count=1", commitSha).
@@ -8,7 +8,6 @@ import (
 	"regexp"
 	"strconv"
 	"strings"
-	"sync"

 	"github.com/fsmiamoto/git-todo-parser/todo"
 	"github.com/jesseduffield/generics/slices"
@@ -16,7 +15,6 @@ import (
 	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
 	"github.com/jesseduffield/lazygit/pkg/commands/types/enums"
 	"github.com/jesseduffield/lazygit/pkg/common"
-	"github.com/jesseduffield/lazygit/pkg/utils"
 	"github.com/samber/lo"
 )

@@ -47,6 +45,7 @@ type CommitLoader struct {
 func NewCommitLoader(
 	cmn *common.Common,
 	cmd oscommands.ICmdObjBuilder,
+	dotGitDir string,
 	getRebaseMode func() (enums.RebaseMode, error),
 	gitCommon *GitCommon,
 ) *CommitLoader {
@@ -56,6 +55,7 @@ func NewCommitLoader(
 		getRebaseMode: getRebaseMode,
 		readFile:      os.ReadFile,
 		walkFiles:     filepath.Walk,
+		dotGitDir:     dotGitDir,
 		mainBranches:  nil,
 		GitCommon:     gitCommon,
 	}
@@ -84,60 +84,31 @@ func (self *CommitLoader) GetCommits(opts GetCommitsOptions) ([]*models.Commit,
 		commits = append(commits, rebasingCommits...)
 	}

-	wg := sync.WaitGroup{}
-
-	wg.Add(2)
-
-	var logErr error
-	go utils.Safe(func() {
-		defer wg.Done()
-
-		logErr = self.getLogCmd(opts).RunAndProcessLines(func(line string) (bool, error) {
-			commit := self.extractCommitFromLine(line)
-			commits = append(commits, commit)
-			return false, nil
-		})
-	})
-
-	var ancestor string
-	go utils.Safe(func() {
-		defer wg.Done()
-
-		ancestor = self.getMergeBase(opts.RefName)
-	})
-
 	passedFirstPushedCommit := false
-	// I can get this before
 	firstPushedCommit, err := self.getFirstPushedCommit(opts.RefName)
 	if err != nil {
 		// must have no upstream branch so we'll consider everything as pushed
 		passedFirstPushedCommit = true
 	}

-	wg.Wait()
-
-	if logErr != nil {
-		return nil, logErr
-	}
-
-	for _, commit := range commits {
+	err = self.getLogCmd(opts).RunAndProcessLines(func(line string) (bool, error) {
+		commit := self.extractCommitFromLine(line)
 		if commit.Sha == firstPushedCommit {
 			passedFirstPushedCommit = true
 		}
-		if passedFirstPushedCommit {
-			commit.Status = models.StatusPushed
-		} else {
-			commit.Status = models.StatusUnpushed
-		}
+		commit.Status = map[bool]models.CommitStatus{true: models.StatusUnpushed, false: models.StatusPushed}[!passedFirstPushedCommit]
+		commits = append(commits, commit)
+		return false, nil
+	})
+	if err != nil {
+		return nil, err
 	}

 	if len(commits) == 0 {
 		return commits, nil
 	}

-	if ancestor != "" {
-		commits = self.setCommitMergedStatuses(ancestor, commits)
-	}
+	commits = self.setCommitMergedStatuses(opts.RefName, commits)

 	return commits, nil
 }
@@ -297,7 +268,7 @@ func (self *CommitLoader) getRebasingCommits(rebaseMode enums.RebaseMode) ([]*mo

 func (self *CommitLoader) getNormalRebasingCommits() ([]*models.Commit, error) {
 	rewrittenCount := 0
-	bytesContent, err := self.readFile(filepath.Join(self.repoPaths.WorktreeGitDirPath(), "rebase-apply/rewritten"))
+	bytesContent, err := self.readFile(filepath.Join(self.dotGitDir, "rebase-apply/rewritten"))
 	if err == nil {
 		content := string(bytesContent)
 		rewrittenCount = len(strings.Split(content, "\n"))
@@ -305,7 +276,7 @@ func (self *CommitLoader) getNormalRebasingCommits() ([]*models.Commit, error) {

 	// we know we're rebasing, so lets get all the files whose names have numbers
 	commits := []*models.Commit{}
-	err = self.walkFiles(filepath.Join(self.repoPaths.WorktreeGitDirPath(), "rebase-apply"), func(path string, f os.FileInfo, err error) error {
+	err = self.walkFiles(filepath.Join(self.dotGitDir, "rebase-apply"), func(path string, f os.FileInfo, err error) error {
 		if rewrittenCount > 0 {
 			rewrittenCount--
 			return nil
@@ -346,7 +317,7 @@ func (self *CommitLoader) getNormalRebasingCommits() ([]*models.Commit, error) {
 // and extracts out the sha and names of commits that we still have to go
 // in the rebase:
 func (self *CommitLoader) getInteractiveRebasingCommits() ([]*models.Commit, error) {
-	bytesContent, err := self.readFile(filepath.Join(self.repoPaths.WorktreeGitDirPath(), "rebase-merge/git-rebase-todo"))
+	bytesContent, err := self.readFile(filepath.Join(self.dotGitDir, "rebase-merge/git-rebase-todo"))
 	if err != nil {
 		self.Log.Error(fmt.Sprintf("error occurred reading git-rebase-todo: %s", err.Error()))
 		// we assume an error means the file doesn't exist so we just return
@@ -391,7 +362,7 @@ func (self *CommitLoader) getInteractiveRebasingCommits() ([]*models.Commit, err
 }

 func (self *CommitLoader) getConflictedCommit(todos []todo.Todo) string {
-	bytesContent, err := self.readFile(filepath.Join(self.repoPaths.WorktreeGitDirPath(), "rebase-merge/done"))
+	bytesContent, err := self.readFile(filepath.Join(self.dotGitDir, "rebase-merge/done"))
 	if err != nil {
 		self.Log.Error(fmt.Sprintf("error occurred reading rebase-merge/done: %s", err.Error()))
 		return ""
@@ -404,7 +375,7 @@ func (self *CommitLoader) getConflictedCommit(todos []todo.Todo) string {
 	}

 	amendFileExists := false
-	if _, err := os.Stat(filepath.Join(self.repoPaths.WorktreeGitDirPath(), "rebase-merge/amend")); err == nil {
+	if _, err := os.Stat(filepath.Join(self.dotGitDir, "rebase-merge/amend")); err == nil {
 		amendFileExists = true
 	}

@@ -493,7 +464,11 @@ func (self *CommitLoader) commitFromPatch(content string) *models.Commit {
 	}
 }

-func (self *CommitLoader) setCommitMergedStatuses(ancestor string, commits []*models.Commit) []*models.Commit {
+func (self *CommitLoader) setCommitMergedStatuses(refName string, commits []*models.Commit) []*models.Commit {
+	ancestor := self.getMergeBase(refName)
+	if ancestor == "" {
+		return commits
+	}
 	passedAncestor := false
 	for i, commit := range commits {
 		if strings.HasPrefix(ancestor, commit.Sha) {
@@ -535,25 +510,13 @@ func (self *CommitLoader) getMergeBase(refName string) string {
 }

 func (self *CommitLoader) getExistingMainBranches() []string {
-	var existingBranches []string
-	var wg sync.WaitGroup
-
-	mainBranches := self.UserConfig.Git.MainBranches
-	existingBranches = make([]string, len(mainBranches))
-
-	for i, branchName := range mainBranches {
-		wg.Add(1)
-		i := i
-		branchName := branchName
-		go utils.Safe(func() {
-			defer wg.Done()
-
+	return lo.FilterMap(self.UserConfig.Git.MainBranches,
+		func(branchName string, _ int) (string, bool) {
 			// Try to determine upstream of local main branch
 			if ref, err := self.cmd.New(
 				NewGitCmd("rev-parse").Arg("--symbolic-full-name", branchName+"@{u}").ToArgv(),
 			).DontLog().RunWithOutput(); err == nil {
-				existingBranches[i] = strings.TrimSpace(ref)
-				return
+				return strings.TrimSpace(ref), true
 			}

 			// If this failed, a local branch for this main branch doesn't exist or it
@@ -562,8 +525,7 @@ func (self *CommitLoader) getExistingMainBranches() []string {
 			if err := self.cmd.New(
 				NewGitCmd("rev-parse").Arg("--verify", "--quiet", ref).ToArgv(),
 			).DontLog().Run(); err == nil {
-				existingBranches[i] = ref
-				return
+				return ref, true
 			}

 			// If this failed as well, try if we have the main branch as a local
@@ -573,18 +535,11 @@ func (self *CommitLoader) getExistingMainBranches() []string {
 			if err := self.cmd.New(
 				NewGitCmd("rev-parse").Arg("--verify", "--quiet", ref).ToArgv(),
 			).DontLog().Run(); err == nil {
-				existingBranches[i] = ref
+				return ref, true
 			}
+
+			return "", false
 		})
-	}
-
-	wg.Wait()
-
-	existingBranches = lo.Filter(existingBranches, func(branch string, _ int) bool {
-		return branch != ""
-	})
-
-	return existingBranches
 }

 func ignoringWarnings(commandOutput string) string {
@@ -1,12 +1,12 @@
 package git_commands

 import (
+	"errors"
 	"path/filepath"
 	"strings"
 	"testing"

 	"github.com/fsmiamoto/git-todo-parser/todo"
-	"github.com/go-errors/errors"
 	"github.com/jesseduffield/lazygit/pkg/commands/models"
 	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
 	"github.com/jesseduffield/lazygit/pkg/commands/types/enums"
@@ -10,23 +10,20 @@ import (

 func TestCommitRewordCommit(t *testing.T) {
 	type scenario struct {
-		testName    string
-		runner      *oscommands.FakeCmdObjRunner
-		summary     string
-		description string
+		testName string
+		runner   *oscommands.FakeCmdObjRunner
+		input    string
 	}
 	scenarios := []scenario{
 		{
 			"Single line reword",
 			oscommands.NewFakeRunner(t).ExpectGitArgs([]string{"commit", "--allow-empty", "--amend", "--only", "-m", "test"}, "", nil),
 			"test",
-			"",
 		},
 		{
 			"Multi line reword",
 			oscommands.NewFakeRunner(t).ExpectGitArgs([]string{"commit", "--allow-empty", "--amend", "--only", "-m", "test", "-m", "line 2\nline 3"}, "", nil),
-			"test",
-			"line 2\nline 3",
+			"test\nline 2\nline 3",
 		},
 	}
 	for _, s := range scenarios {
@@ -34,7 +31,7 @@ func TestCommitRewordCommit(t *testing.T) {
 		t.Run(s.testName, func(t *testing.T) {
 			instance := buildCommitCommands(commonDeps{runner: s.runner})

-			assert.NoError(t, instance.RewordLastCommit(s.summary, s.description))
+			assert.NoError(t, instance.RewordLastCommit(s.input))
 			s.runner.CheckForMissingCalls()
 		})
 	}
@@ -53,8 +50,7 @@ func TestCommitResetToCommit(t *testing.T) {
 func TestCommitCommitCmdObj(t *testing.T) {
 	type scenario struct {
 		testName             string
-		summary              string
-		description          string
+		message              string
 		configSignoff        bool
 		configSkipHookPrefix string
 		expectedArgs         []string
@@ -63,36 +59,35 @@ func TestCommitCommitCmdObj(t *testing.T) {
 	scenarios := []scenario{
 		{
 			testName:             "Commit",
-			summary:              "test",
+			message:              "test",
 			configSignoff:        false,
 			configSkipHookPrefix: "",
 			expectedArgs:         []string{"commit", "-m", "test"},
 		},
 		{
 			testName:             "Commit with --no-verify flag",
-			summary:              "WIP: test",
+			message:              "WIP: test",
 			configSignoff:        false,
 			configSkipHookPrefix: "WIP",
 			expectedArgs:         []string{"commit", "--no-verify", "-m", "WIP: test"},
 		},
 		{
 			testName:             "Commit with multiline message",
-			summary:              "line1",
-			description:          "line2",
+			message:              "line1\nline2",
 			configSignoff:        false,
 			configSkipHookPrefix: "",
 			expectedArgs:         []string{"commit", "-m", "line1", "-m", "line2"},
 		},
 		{
 			testName:             "Commit with signoff",
-			summary:              "test",
+			message:              "test",
 			configSignoff:        true,
 			configSkipHookPrefix: "",
 			expectedArgs:         []string{"commit", "--signoff", "-m", "test"},
 		},
 		{
 			testName:             "Commit with signoff and no-verify",
-			summary:              "WIP: test",
+			message:              "WIP: test",
 			configSignoff:        true,
 			configSkipHookPrefix: "WIP",
 			expectedArgs:         []string{"commit", "--no-verify", "--signoff", "-m", "WIP: test"},
@@ -109,7 +104,7 @@ func TestCommitCommitCmdObj(t *testing.T) {
 			runner := oscommands.NewFakeRunner(t).ExpectGitArgs(s.expectedArgs, "", nil)
 			instance := buildCommitCommands(commonDeps{userConfig: userConfig, runner: runner})

-			assert.NoError(t, instance.CommitCmdObj(s.summary, s.description).Run())
+			assert.NoError(t, instance.CommitCmdObj(s.message).Run())
 			runner.CheckForMissingCalls()
 		})
 	}
@@ -12,7 +12,7 @@ type GitCommon struct {
 	version   *GitVersion
 	cmd       oscommands.ICmdObjBuilder
 	os        *oscommands.OSCommand
-	repoPaths *RepoPaths
+	dotGitDir string
 	repo      *gogit.Repository
 	config    *ConfigCommands
 	// mutex for doing things like push/pull/fetch
@@ -24,7 +24,7 @@ func NewGitCommon(
 	version *GitVersion,
 	cmd oscommands.ICmdObjBuilder,
 	osCommand *oscommands.OSCommand,
-	repoPaths *RepoPaths,
+	dotGitDir string,
 	repo *gogit.Repository,
 	config *ConfigCommands,
 	syncMutex *deadlock.Mutex,
@@ -34,7 +34,7 @@ func NewGitCommon(
 		version:   version,
 		cmd:       cmd,
 		os:        osCommand,
-		repoPaths: repoPaths,
+		dotGitDir: dotGitDir,
 		repo:      repo,
 		config:    config,
 		syncMutex: syncMutex,
@@ -11,7 +11,6 @@ import (
 	"github.com/jesseduffield/lazygit/pkg/common"
 	"github.com/jesseduffield/lazygit/pkg/config"
 	"github.com/jesseduffield/lazygit/pkg/utils"
-	"github.com/spf13/afero"
 )

 type commonDeps struct {
@@ -21,10 +20,9 @@ type commonDeps struct {
 	gitConfig  *git_config.FakeGitConfig
 	getenv     func(string) string
 	removeFile func(string) error
+	dotGitDir  string
 	common     *common.Common
 	cmd        *oscommands.CmdObjBuilder
-	fs         afero.Fs
-	repoPaths  *RepoPaths
 }

 func buildGitCommon(deps commonDeps) *GitCommon {
@@ -35,16 +33,6 @@ func buildGitCommon(deps commonDeps) *GitCommon {
 		gitCommon.Common = utils.NewDummyCommonWithUserConfig(deps.userConfig)
 	}

-	if deps.fs != nil {
-		gitCommon.Fs = deps.fs
-	}
-
-	if deps.repoPaths != nil {
-		gitCommon.repoPaths = deps.repoPaths
-	} else {
-		gitCommon.repoPaths = MockRepoPaths(".git")
-	}
-
 	runner := deps.runner
 	if runner == nil {
 		runner = oscommands.NewFakeRunner(nil)
@@ -93,6 +81,11 @@ func buildGitCommon(deps commonDeps) *GitCommon {
 		TempDir:      os.TempDir(),
 	})

+	gitCommon.dotGitDir = deps.dotGitDir
+	if gitCommon.dotGitDir == "" {
+		gitCommon.dotGitDir = ".git"
+	}
+
 	return gitCommon
 }

@@ -103,7 +96,7 @@ func buildRepo() *gogit.Repository {
 }

 func buildFileLoader(gitCommon *GitCommon) *FileLoader {
-	return NewFileLoader(gitCommon, gitCommon.cmd, gitCommon.config)
+	return NewFileLoader(gitCommon.Common, gitCommon.cmd, gitCommon.config)
 }

 func buildSubmoduleCommands(deps commonDeps) *SubmoduleCommands {
@@ -125,7 +118,7 @@ func buildWorkingTreeCommands(deps commonDeps) *WorkingTreeCommands {
 	return NewWorkingTreeCommands(gitCommon, submoduleCommands, fileLoader)
 }

-func buildPatchCommands(deps commonDeps) *PatchCommands { //nolint:golint,unused
+func buildPatchCommands(deps commonDeps) *PatchCommands {
 	gitCommon := buildGitCommon(deps)
 	rebaseCommands := buildRebaseCommands(deps)
 	commitCommands := buildCommitCommands(deps)
@@ -139,7 +132,7 @@ func buildPatchCommands(deps commonDeps) *PatchCommands { //nolint:golint,unused
 	return NewPatchCommands(gitCommon, rebaseCommands, commitCommands, statusCommands, stashCommands, patchBuilder)
 }

-func buildStatusCommands(deps commonDeps) *StatusCommands { //nolint:golint,unused
+func buildStatusCommands(deps commonDeps) *StatusCommands {
 	gitCommon := buildGitCommon(deps)

 	return NewStatusCommands(gitCommon)
@@ -131,17 +131,6 @@ func (self *FileCommands) GetEditAtLineAndWaitCmdStr(filename string, lineNumber
 	return cmdStr
 }

-func (self *FileCommands) GetOpenDirInEditorCmdStr(path string) string {
-	template := config.GetOpenDirInEditorTemplate(&self.UserConfig.OS, self.guessDefaultEditor)
-
-	templateValues := map[string]string{
-		"dir": self.cmd.Quote(path),
-	}
-
-	cmdStr := utils.ResolvePlaceholderString(template, templateValues)
-	return cmdStr
-}
-
 func (self *FileCommands) guessDefaultEditor() string {
 	// Try to query a few places where editors get configured
 	editor := self.config.GetCoreEditor()
@@ -2,11 +2,11 @@ package git_commands

 import (
 	"fmt"
-	"path/filepath"
 	"strings"

 	"github.com/jesseduffield/lazygit/pkg/commands/models"
 	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
+	"github.com/jesseduffield/lazygit/pkg/common"
 )

 type FileLoaderConfig interface {
@@ -14,15 +14,15 @@ type FileLoaderConfig interface {
 }

 type FileLoader struct {
-	*GitCommon
+	*common.Common
 	cmd         oscommands.ICmdObjBuilder
 	config      FileLoaderConfig
 	getFileType func(string) string
 }

-func NewFileLoader(gitCommon *GitCommon, cmd oscommands.ICmdObjBuilder, config FileLoaderConfig) *FileLoader {
+func NewFileLoader(cmn *common.Common, cmd oscommands.ICmdObjBuilder, config FileLoaderConfig) *FileLoader {
 	return &FileLoader{
-		GitCommon:   gitCommon,
+		Common:      cmn,
 		cmd:         cmd,
 		getFileType: oscommands.FileType,
 		config:      config,
@@ -58,32 +58,13 @@ func (self *FileLoader) GetStatusFiles(opts GetStatusFileOptions) []*models.File
 			Name:          status.Name,
 			PreviousName:  status.PreviousName,
 			DisplayString: status.StatusString,
+			Type:          self.getFileType(status.Name),
 		}

 		models.SetStatusFields(file, status.Change)
 		files = append(files, file)
 	}

-	// Go through the files to see if any of these files are actually worktrees
-	// so that we can render them correctly
-	worktreePaths := linkedWortkreePaths(self.Fs, self.repoPaths.RepoGitDirPath())
-	for _, file := range files {
-		for _, worktreePath := range worktreePaths {
-			absFilePath, err := filepath.Abs(file.Name)
-			if err != nil {
-				self.Log.Error(err)
-				continue
-			}
-			if absFilePath == worktreePath {
-				file.IsWorktree = true
-				// `git status` renders this worktree as a folder with a trailing slash but we'll represent it as a singular worktree
-				// If we include the slash, it will be rendered as a folder with a null file inside.
-				file.Name = strings.TrimSuffix(file.Name, "/")
-				break
-			}
-		}
-	}
-
 	return files
 }

@@ -5,6 +5,7 @@ import (

 	"github.com/jesseduffield/lazygit/pkg/commands/models"
 	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
+	"github.com/jesseduffield/lazygit/pkg/utils"
 	"github.com/stretchr/testify/assert"
 )

@@ -40,6 +41,7 @@ func TestFileGetStatusFiles(t *testing.T) {
 					HasMergeConflicts:       false,
 					HasInlineMergeConflicts: false,
 					DisplayString:           "MM file1.txt",
+					Type:                    "file",
 					ShortStatus:             "MM",
 				},
 				{
@@ -52,6 +54,7 @@ func TestFileGetStatusFiles(t *testing.T) {
 					HasMergeConflicts:       false,
 					HasInlineMergeConflicts: false,
 					DisplayString:           "A  file3.txt",
+					Type:                    "file",
 					ShortStatus:             "A ",
 				},
 				{
@@ -64,6 +67,7 @@ func TestFileGetStatusFiles(t *testing.T) {
 					HasMergeConflicts:       false,
 					HasInlineMergeConflicts: false,
 					DisplayString:           "AM file2.txt",
+					Type:                    "file",
 					ShortStatus:             "AM",
 				},
 				{
@@ -76,6 +80,7 @@ func TestFileGetStatusFiles(t *testing.T) {
 					HasMergeConflicts:       false,
 					HasInlineMergeConflicts: false,
 					DisplayString:           "?? file4.txt",
+					Type:                    "file",
 					ShortStatus:             "??",
 				},
 				{
@@ -88,6 +93,7 @@ func TestFileGetStatusFiles(t *testing.T) {
 					HasMergeConflicts:       true,
 					HasInlineMergeConflicts: true,
 					DisplayString:           "UU file5.txt",
+					Type:                    "file",
 					ShortStatus:             "UU",
 				},
 			},
@@ -107,6 +113,7 @@ func TestFileGetStatusFiles(t *testing.T) {
 					HasMergeConflicts:       false,
 					HasInlineMergeConflicts: false,
 					DisplayString:           "MM a\nb.txt",
+					Type:                    "file",
 					ShortStatus:             "MM",
 				},
 			},
@@ -130,6 +137,7 @@ func TestFileGetStatusFiles(t *testing.T) {
 					HasMergeConflicts:       false,
 					HasInlineMergeConflicts: false,
 					DisplayString:           "R  before1.txt -> after1.txt",
+					Type:                    "file",
 					ShortStatus:             "R ",
 				},
 				{
@@ -143,6 +151,7 @@ func TestFileGetStatusFiles(t *testing.T) {
 					HasMergeConflicts:       false,
 					HasInlineMergeConflicts: false,
 					DisplayString:           "RM before2.txt -> after2.txt",
+					Type:                    "file",
 					ShortStatus:             "RM",
 				},
 			},
@@ -165,6 +174,7 @@ func TestFileGetStatusFiles(t *testing.T) {
 					HasMergeConflicts:       false,
 					HasInlineMergeConflicts: false,
 					DisplayString:           "?? a -> b.txt",
+					Type:                    "file",
 					ShortStatus:             "??",
 				},
 			},
@@ -177,7 +187,7 @@ func TestFileGetStatusFiles(t *testing.T) {
 			cmd := oscommands.NewDummyCmdObjBuilder(s.runner)

 			loader := &FileLoader{
-				GitCommon:   buildGitCommon(commonDeps{}),
+				Common:      utils.NewDummyCommon(),
 				cmd:         cmd,
 				config:      &FakeFileLoaderConfig{showUntrackedFiles: "yes"},
 				getFileType: func(string) string { return "file" },
@@ -1,8 +1,6 @@
 package git_commands

-import (
-	"strings"
-)
+import "strings"

 // convenience struct for building git commands. Especially useful when
 // including conditional args
@@ -44,38 +42,20 @@ func (self *GitCommandBuilder) Config(value string) *GitCommandBuilder {
 	return self
 }

-// the -C arg will make git do a `cd` to the directory before doing anything else
-func (self *GitCommandBuilder) Dir(path string) *GitCommandBuilder {
+func (self *GitCommandBuilder) RepoPath(value string) *GitCommandBuilder {
 	// repo path comes before the command
-	self.args = append([]string{"-C", path}, self.args...)
+	self.args = append([]string{"-C", value}, self.args...)

 	return self
 }

-// Note, you may prefer to use the Dir method instead of this one
-func (self *GitCommandBuilder) Worktree(path string) *GitCommandBuilder {
-	// worktree arg comes before the command
+func (self *GitCommandBuilder) WorktreePath(path string) *GitCommandBuilder {
+	// worktree path comes before the command
 	self.args = append([]string{"--work-tree", path}, self.args...)

 	return self
 }

-// Note, you may prefer to use the Dir method instead of this one
-func (self *GitCommandBuilder) GitDir(path string) *GitCommandBuilder {
-	// git dir arg comes before the command
-	self.args = append([]string{"--git-dir", path}, self.args...)
-
-	return self
-}
-
-func (self *GitCommandBuilder) GitDirIf(condition bool, path string) *GitCommandBuilder {
-	if condition {
-		return self.GitDir(path)
-	}
-
-	return self
-}
-
 func (self *GitCommandBuilder) ToArgv() []string {
 	return append([]string{"git"}, self.args...)
 }
@@ -45,7 +45,7 @@ func TestGitCommandBuilder(t *testing.T) {
 			expected: []string{"git", "-c", "user.email=bar", "-c", "user.name=foo", "push"},
 		},
 		{
-			input:    NewGitCmd("push").Dir("a/b/c").ToArgv(),
+			input:    NewGitCmd("push").RepoPath("a/b/c").ToArgv(),
 			expected: []string{"git", "-C", "a/b/c", "push"},
 		},
 	}
@@ -1,6 +1,7 @@
 package git_commands

 import (
+	"fmt"
 	"path/filepath"
 	"time"

@@ -10,6 +11,7 @@ import (
 	"github.com/jesseduffield/lazygit/pkg/commands/models"
 	"github.com/jesseduffield/lazygit/pkg/commands/patch"
 	"github.com/jesseduffield/lazygit/pkg/commands/types/enums"
+	"github.com/jesseduffield/lazygit/pkg/utils"
 )

 type PatchCommands struct {
@@ -79,7 +81,7 @@ func (self *PatchCommands) applyPatchFile(filepath string, opts ApplyPatchOpts)
 }

 func (self *PatchCommands) SaveTemporaryPatch(patch string) (string, error) {
-	filepath := filepath.Join(self.os.GetTempDir(), self.repoPaths.RepoName(), time.Now().Format("Jan _2 15.04.05.000000000")+".patch")
+	filepath := filepath.Join(self.os.GetTempDir(), utils.GetCurrentRepoName(), time.Now().Format("Jan _2 15.04.05.000000000")+".patch")
 	self.Log.Infof("saving temporary patch to %s", filepath)
 	if err := self.os.CreateFileWithContent(filepath, patch); err != nil {
 		return "", err
@@ -272,12 +274,7 @@ func (self *PatchCommands) MovePatchIntoIndex(commits []*models.Commit, commitId
 	return self.rebase.ContinueRebase()
 }

-func (self *PatchCommands) PullPatchIntoNewCommit(
-	commits []*models.Commit,
-	commitIdx int,
-	commitSummary string,
-	commitDescription string,
-) error {
+func (self *PatchCommands) PullPatchIntoNewCommit(commits []*models.Commit, commitIdx int) error {
 	if err := self.rebase.BeginInteractiveRebaseForCommit(commits, commitIdx, false); err != nil {
 		return err
 	}
@@ -303,7 +300,9 @@ func (self *PatchCommands) PullPatchIntoNewCommit(
 		return err
 	}

-	if err := self.commit.CommitCmdObj(commitSummary, commitDescription).Run(); err != nil {
+	head_message, _ := self.commit.GetHeadCommitMessage()
+	new_message := fmt.Sprintf("Split from \"%s\"", head_message)
+	if err := self.commit.CommitCmdObj(new_message).Run(); err != nil {
 		return err
 	}

@@ -0,0 +1,68 @@
+package git_commands
+
+import (
+	"fmt"
+	"os"
+	"testing"
+
+	"github.com/go-errors/errors"
+	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestPatchApplyPatch(t *testing.T) {
+	type scenario struct {
+		testName string
+		opts     ApplyPatchOpts
+		runner   *oscommands.FakeCmdObjRunner
+		test     func(error)
+	}
+
+	// expectedArgs excludes the last argument which is an indeterminate filename
+	expectFn := func(expectedArgs []string, errToReturn error) func(cmdObj oscommands.ICmdObj) (string, error) {
+		return func(cmdObj oscommands.ICmdObj) (string, error) {
+			args := cmdObj.Args()
+
+			assert.Equal(t, len(args), len(expectedArgs)+1, fmt.Sprintf("unexpected command: %s", cmdObj.ToString()))
+
+			filename := args[len(args)-1]
+
+			content, err := os.ReadFile(filename)
+			assert.NoError(t, err)
+
+			assert.Equal(t, "test", string(content))
+
+			return "", errToReturn
+		}
+	}
+
+	scenarios := []scenario{
+		{
+			testName: "valid case",
+			opts:     ApplyPatchOpts{Cached: true},
+			runner: oscommands.NewFakeRunner(t).
+				ExpectFunc(expectFn([]string{"git", "apply", "--cached"}, nil)),
+			test: func(err error) {
+				assert.NoError(t, err)
+			},
+		},
+		{
+			testName: "command returns error",
+			opts:     ApplyPatchOpts{Cached: true},
+			runner: oscommands.NewFakeRunner(t).
+				ExpectFunc(expectFn([]string{"git", "apply", "--cached"}, errors.New("error"))),
+			test: func(err error) {
+				assert.Error(t, err)
+			},
+		},
+	}
+
+	for _, s := range scenarios {
+		s := s
+		t.Run(s.testName, func(t *testing.T) {
+			instance := buildPatchCommands(commonDeps{runner: s.runner})
+			s.test(instance.ApplyPatch("test", s.opts))
+			s.runner.CheckForMissingCalls()
+		})
+	}
+}
@@ -35,10 +35,10 @@ func NewRebaseCommands(
 	}
 }

-func (self *RebaseCommands) RewordCommit(commits []*models.Commit, index int, summary string, description string) error {
+func (self *RebaseCommands) RewordCommit(commits []*models.Commit, index int, message string) error {
 	if models.IsHeadCommit(commits, index) {
 		// we've selected the top commit so no rebase is required
-		return self.commit.RewordLastCommit(summary, description)
+		return self.commit.RewordLastCommit(message)
 	}

 	err := self.BeginInteractiveRebaseForCommit(commits, index, false)
@@ -47,7 +47,7 @@ func (self *RebaseCommands) RewordCommit(commits []*models.Commit, index int, su
 	}

 	// now the selected commit should be our head so we'll amend it with the new message
-	err = self.commit.RewordLastCommit(summary, description)
+	err = self.commit.RewordLastCommit(message)
 	if err != nil {
 		return err
 	}
@@ -243,18 +243,18 @@ func (self *RebaseCommands) AmendTo(commits []*models.Commit, commitIndex int) e
 // EditRebaseTodo sets the action for a given rebase commit in the git-rebase-todo file
 func (self *RebaseCommands) EditRebaseTodo(commit *models.Commit, action todo.TodoCommand) error {
 	return utils.EditRebaseTodo(
-		filepath.Join(self.repoPaths.WorktreeGitDirPath(), "rebase-merge/git-rebase-todo"), commit.Sha, commit.Action, action, self.config.GetCoreCommentChar())
+		filepath.Join(self.dotGitDir, "rebase-merge/git-rebase-todo"), commit.Sha, commit.Action, action, self.config.GetCoreCommentChar())
 }

 // MoveTodoDown moves a rebase todo item down by one position
 func (self *RebaseCommands) MoveTodoDown(commit *models.Commit) error {
-	fileName := filepath.Join(self.repoPaths.WorktreeGitDirPath(), "rebase-merge/git-rebase-todo")
+	fileName := filepath.Join(self.dotGitDir, "rebase-merge/git-rebase-todo")
 	return utils.MoveTodoDown(fileName, commit.Sha, commit.Action, self.config.GetCoreCommentChar())
 }

 // MoveTodoDown moves a rebase todo item down by one position
 func (self *RebaseCommands) MoveTodoUp(commit *models.Commit) error {
-	fileName := filepath.Join(self.repoPaths.WorktreeGitDirPath(), "rebase-merge/git-rebase-todo")
+	fileName := filepath.Join(self.dotGitDir, "rebase-merge/git-rebase-todo")
 	return utils.MoveTodoUp(fileName, commit.Sha, commit.Action, self.config.GetCoreCommentChar())
 }

@@ -79,7 +79,7 @@ func TestRebaseRebaseBranch(t *testing.T) {
 // environment variables that suppress an interactive editor
 func TestRebaseSkipEditorCommand(t *testing.T) {
 	cmdArgs := []string{"git", "blah"}
-	runner := oscommands.NewFakeRunner(t).ExpectFunc("matches editor env var", func(cmdObj oscommands.ICmdObj) bool {
+	runner := oscommands.NewFakeRunner(t).ExpectFunc(func(cmdObj oscommands.ICmdObj) (string, error) {
 		assert.EqualValues(t, cmdArgs, cmdObj.Args())
 		envVars := cmdObj.GetEnvVars()
 		for _, regexStr := range []string{
@@ -94,11 +94,11 @@ func TestRebaseSkipEditorCommand(t *testing.T) {
 				return regexp.MustCompile(regexStr).MatchString(envVar)
 			})
 			if !foundMatch {
-				return false
+				t.Errorf("expected environment variable %s to be set", regexStr)
 			}
 		}
-		return true
-	}, "", nil)
+		return "", nil
+	})
 	instance := buildRebaseCommands(commonDeps{runner: runner})
 	err := instance.runSkipEditorCommand(instance.cmd.New(cmdArgs))
 	assert.NoError(t, err)
@@ -35,19 +35,34 @@ func (self *ReflogCommitLoader) GetReflogCommits(lastReflogCommit *models.Commit
 		ToArgv()

 	cmdObj := self.cmd.New(cmdArgs).DontLog()
-
 	onlyObtainedNewReflogCommits := false
 	err := cmdObj.RunAndProcessLines(func(line string) (bool, error) {
-		commit, ok := self.parseLine(line)
-		if !ok {
+		fields := strings.SplitN(line, "\x00", 4)
+		if len(fields) <= 3 {
 			return false, nil
 		}

+		unixTimestamp, _ := strconv.Atoi(fields[1])
+
+		parentHashes := fields[3]
+		parents := []string{}
+		if len(parentHashes) > 0 {
+			parents = strings.Split(parentHashes, " ")
+		}
+
+		commit := &models.Commit{
+			Sha:           fields[0],
+			Name:          fields[2],
+			UnixTimestamp: int64(unixTimestamp),
+			Status:        models.StatusReflog,
+			Parents:       parents,
+		}
+
 		// note that the unix timestamp here is the timestamp of the COMMIT, not the reflog entry itself,
 		// so two consecutive reflog entries may have both the same SHA and therefore same timestamp.
 		// We use the reflog message to disambiguate, and fingers crossed that we never see the same of those
 		// twice in a row. Reason being that it would mean we'd be erroneously exiting early.
-		if lastReflogCommit != nil && self.sameReflogCommit(commit, lastReflogCommit) {
+		if lastReflogCommit != nil && commit.Sha == lastReflogCommit.Sha && commit.UnixTimestamp == lastReflogCommit.UnixTimestamp && commit.Name == lastReflogCommit.Name {
 			onlyObtainedNewReflogCommits = true
 			// after this point we already have these reflogs loaded so we'll simply return the new ones
 			return true, nil
@@ -62,30 +77,3 @@ func (self *ReflogCommitLoader) GetReflogCommits(lastReflogCommit *models.Commit

 	return commits, onlyObtainedNewReflogCommits, nil
 }
-
-func (self *ReflogCommitLoader) sameReflogCommit(a *models.Commit, b *models.Commit) bool {
-	return a.Sha == b.Sha && a.UnixTimestamp == b.UnixTimestamp && a.Name == b.Name
-}
-
-func (self *ReflogCommitLoader) parseLine(line string) (*models.Commit, bool) {
-	fields := strings.SplitN(line, "\x00", 4)
-	if len(fields) <= 3 {
-		return nil, false
-	}
-
-	unixTimestamp, _ := strconv.Atoi(fields[1])
-
-	parentHashes := fields[3]
-	parents := []string{}
-	if len(parentHashes) > 0 {
-		parents = strings.Split(parentHashes, " ")
-	}
-
-	return &models.Commit{
-		Sha:           fields[0],
-		Name:          fields[2],
-		UnixTimestamp: int64(unixTimestamp),
-		Status:        models.StatusReflog,
-		Parents:       parents,
-	}, true
-}
@@ -1,15 +1,15 @@
 package git_commands

 import (
+	"fmt"
+	"regexp"
 	"strings"
-	"sync"

 	"github.com/jesseduffield/generics/slices"
 	gogit "github.com/jesseduffield/go-git/v5"
 	"github.com/jesseduffield/lazygit/pkg/commands/models"
 	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
 	"github.com/jesseduffield/lazygit/pkg/common"
-	"github.com/jesseduffield/lazygit/pkg/utils"
 )

 type RemoteLoader struct {
@@ -31,31 +31,29 @@ func NewRemoteLoader(
 }

 func (self *RemoteLoader) GetRemotes() ([]*models.Remote, error) {
-	wg := sync.WaitGroup{}
-	wg.Add(1)
-
-	var remoteBranchesByRemoteName map[string][]*models.RemoteBranch
-	var remoteBranchesErr error
-	go utils.Safe(func() {
-		defer wg.Done()
-
-		remoteBranchesByRemoteName, remoteBranchesErr = self.getRemoteBranchesByRemoteName()
-	})
+	cmdArgs := NewGitCmd("branch").Arg("-r").ToArgv()
+	remoteBranchesStr, err := self.cmd.New(cmdArgs).DontLog().RunWithOutput()
+	if err != nil {
+		return nil, err
+	}

 	goGitRemotes, err := self.getGoGitRemotes()
 	if err != nil {
 		return nil, err
 	}

-	wg.Wait()
-
-	if remoteBranchesErr != nil {
-		return nil, remoteBranchesErr
-	}
-
+	// first step is to get our remotes from go-git
 	remotes := slices.Map(goGitRemotes, func(goGitRemote *gogit.Remote) *models.Remote {
 		remoteName := goGitRemote.Config().Name
-		branches := remoteBranchesByRemoteName[remoteName]
+
+		re := regexp.MustCompile(fmt.Sprintf(`(?m)^\s*%s\/([\S]+)`, regexp.QuoteMeta(remoteName)))
+		matches := re.FindAllStringSubmatch(remoteBranchesStr, -1)
+		branches := slices.Map(matches, func(match []string) *models.RemoteBranch {
+			return &models.RemoteBranch{
+				Name:       match[1],
+				RemoteName: remoteName,
+			}
+		})

 		return &models.Remote{
 			Name:     goGitRemote.Config().Name,
@@ -78,42 +76,3 @@ func (self *RemoteLoader) GetRemotes() ([]*models.Remote, error) {

 	return remotes, nil
 }
-
-func (self *RemoteLoader) getRemoteBranchesByRemoteName() (map[string][]*models.RemoteBranch, error) {
-	remoteBranchesByRemoteName := make(map[string][]*models.RemoteBranch)
-
-	cmdArgs := NewGitCmd("branch").Arg("-r").ToArgv()
-	err := self.cmd.New(cmdArgs).DontLog().RunAndProcessLines(func(line string) (bool, error) {
-		// excluding lines like 'origin/HEAD -> origin/master' (there will be a separate
-		// line for 'origin/master')
-		if strings.Contains(line, "->") {
-			return false, nil
-		}
-
-		line = strings.TrimSpace(line)
-
-		split := strings.SplitN(line, "/", 2)
-		if len(split) != 2 {
-			return false, nil
-		}
-		remoteName := split[0]
-		name := split[1]
-
-		_, ok := remoteBranchesByRemoteName[remoteName]
-		if !ok {
-			remoteBranchesByRemoteName[remoteName] = []*models.RemoteBranch{}
-		}
-
-		remoteBranchesByRemoteName[remoteName] = append(remoteBranchesByRemoteName[remoteName],
-			&models.RemoteBranch{
-				Name:       name,
-				RemoteName: remoteName,
-			})
-		return false, nil
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	return remoteBranchesByRemoteName, nil
-}
@@ -1,248 +0,0 @@
-package git_commands
-
-import (
-	"fmt"
-	ioFs "io/fs"
-	"os"
-	"path"
-	"path/filepath"
-	"strings"
-
-	"github.com/go-errors/errors"
-	"github.com/jesseduffield/lazygit/pkg/env"
-	"github.com/samber/lo"
-	"github.com/spf13/afero"
-)
-
-type RepoPaths struct {
-	currentPath        string
-	worktreePath       string
-	worktreeGitDirPath string
-	repoPath           string
-	repoGitDirPath     string
-	repoName           string
-}
-
-// Current working directory of the program. Currently, this will always
-// be the same as WorktreePath(), but in future we may support running
-// lazygit from inside a subdirectory of the worktree.
-func (self *RepoPaths) CurrentPath() string {
-	return self.currentPath
-}
-
-// Path to the current worktree. If we're in the main worktree, this will
-// be the same as RepoPath()
-func (self *RepoPaths) WorktreePath() string {
-	return self.worktreePath
-}
-
-// Path of the worktree's git dir.
-// If we're in the main worktree, this will be the .git dir under the RepoPath().
-// If we're in a linked worktree, it will be the directory pointed at by the worktree's .git file
-func (self *RepoPaths) WorktreeGitDirPath() string {
-	return self.worktreeGitDirPath
-}
-
-// Path of the repo. If we're in a the main worktree, this will be the same as WorktreePath()
-// If we're in a bare repo, it will be the parent folder of the bare repo
-func (self *RepoPaths) RepoPath() string {
-	return self.repoPath
-}
-
-// path of the git-dir for the repo.
-// If this is a bare repo, it will be the location of the bare repo
-// If this is a non-bare repo, it will be the location of the .git dir in
-// the main worktree.
-func (self *RepoPaths) RepoGitDirPath() string {
-	return self.repoGitDirPath
-}
-
-// Name of the repo. Basename of the folder containing the repo.
-func (self *RepoPaths) RepoName() string {
-	return self.repoName
-}
-
-// Returns the repo paths for a typical repo
-func MockRepoPaths(currentPath string) *RepoPaths {
-	return &RepoPaths{
-		currentPath:        currentPath,
-		worktreePath:       currentPath,
-		worktreeGitDirPath: path.Join(currentPath, ".git"),
-		repoPath:           currentPath,
-		repoGitDirPath:     path.Join(currentPath, ".git"),
-		repoName:           "lazygit",
-	}
-}
-
-func GetRepoPaths(
-	fs afero.Fs,
-	currentPath string,
-) (*RepoPaths, error) {
-	return getRepoPathsAux(afero.NewOsFs(), resolveSymlink, currentPath)
-}
-
-func getRepoPathsAux(
-	fs afero.Fs,
-	resolveSymlinkFn func(string) (string, error),
-	currentPath string,
-) (*RepoPaths, error) {
-	worktreePath := currentPath
-	repoGitDirPath, repoPath, err := getCurrentRepoGitDirPath(fs, resolveSymlinkFn, currentPath)
-	if err != nil {
-		return nil, errors.Errorf("failed to get repo git dir path: %v", err)
-	}
-	worktreeGitDirPath, err := worktreeGitDirPath(fs, currentPath)
-	if err != nil {
-		return nil, errors.Errorf("failed to get worktree git dir path: %v", err)
-	}
-	repoName := path.Base(repoPath)
-
-	return &RepoPaths{
-		currentPath:        currentPath,
-		worktreePath:       worktreePath,
-		worktreeGitDirPath: worktreeGitDirPath,
-		repoPath:           repoPath,
-		repoGitDirPath:     repoGitDirPath,
-		repoName:           repoName,
-	}, nil
-}
-
-// Returns the path of the git-dir for the worktree. For linked worktrees, the worktree has
-// a .git file that points to the git-dir (which itself lives in the git-dir
-// of the repo)
-func worktreeGitDirPath(fs afero.Fs, worktreePath string) (string, error) {
-	// if .git is a file, we're in a linked worktree, otherwise we're in
-	// the main worktree
-	dotGitPath := path.Join(worktreePath, ".git")
-	gitFileInfo, err := fs.Stat(dotGitPath)
-	if err != nil {
-		return "", err
-	}
-
-	if gitFileInfo.IsDir() {
-		return dotGitPath, nil
-	}
-
-	return linkedWorktreeGitDirPath(fs, worktreePath)
-}
-
-func linkedWorktreeGitDirPath(fs afero.Fs, worktreePath string) (string, error) {
-	dotGitPath := path.Join(worktreePath, ".git")
-	gitFileContents, err := afero.ReadFile(fs, dotGitPath)
-	if err != nil {
-		return "", err
-	}
-
-	// The file will have `gitdir: /path/to/.git/worktrees/<worktree-name>`
-	gitDirLine := lo.Filter(strings.Split(string(gitFileContents), "\n"), func(line string, _ int) bool {
-		return strings.HasPrefix(line, "gitdir: ")
-	})
-
-	if len(gitDirLine) == 0 {
-		return "", errors.New(fmt.Sprintf("%s is a file which suggests we are in a submodule or a worktree but the file's contents do not contain a gitdir pointing to the actual .git directory", dotGitPath))
-	}
-
-	gitDir := strings.TrimPrefix(gitDirLine[0], "gitdir: ")
-	return gitDir, nil
-}
-
-func getCurrentRepoGitDirPath(
-	fs afero.Fs,
-	resolveSymlinkFn func(string) (string, error),
-	currentPath string,
-) (string, string, error) {
-	var unresolvedGitPath string
-	if env.GetGitDirEnv() != "" {
-		unresolvedGitPath = env.GetGitDirEnv()
-	} else {
-		unresolvedGitPath = path.Join(currentPath, ".git")
-	}
-
-	gitPath, err := resolveSymlinkFn(unresolvedGitPath)
-	if err != nil {
-		return "", "", err
-	}
-
-	// check if .git is a file or a directory
-	gitFileInfo, err := fs.Stat(gitPath)
-	if err != nil {
-		return "", "", err
-	}
-
-	if gitFileInfo.IsDir() {
-		// must be in the main worktree
-		return gitPath, path.Dir(gitPath), nil
-	}
-
-	// either in a submodule, or worktree
-	worktreeGitPath, err := linkedWorktreeGitDirPath(fs, currentPath)
-	if err != nil {
-		return "", "", errors.Errorf("could not find git dir for %s: %v", currentPath, err)
-	}
-
-	// confirm whether the next directory up is the worktrees/submodules directory
-	parent := path.Dir(worktreeGitPath)
-	if path.Base(parent) != "worktrees" && path.Base(parent) != "modules" {
-		return "", "", errors.Errorf("could not find git dir for %s", currentPath)
-	}
-
-	// if it's a submodule, we treat it as its own repo
-	if path.Base(parent) == "modules" {
-		return worktreeGitPath, currentPath, nil
-	}
-
-	gitDirPath := path.Dir(parent)
-	return gitDirPath, path.Dir(gitDirPath), nil
-}
-
-// takes a path containing a symlink and returns the true path
-func resolveSymlink(path string) (string, error) {
-	l, err := os.Lstat(path)
-	if err != nil {
-		return "", err
-	}
-
-	if l.Mode()&os.ModeSymlink == 0 {
-		return path, nil
-	}
-
-	return filepath.EvalSymlinks(path)
-}
-
-// Returns the paths of linked worktrees
-func linkedWortkreePaths(fs afero.Fs, repoGitDirPath string) []string {
-	result := []string{}
-	// For each directory in this path we're going to cat the `gitdir` file and append its contents to our result
-	// That file points us to the `.git` file in the worktree.
-	worktreeGitDirsPath := path.Join(repoGitDirPath, "worktrees")
-
-	// ensure the directory exists
-	_, err := fs.Stat(worktreeGitDirsPath)
-	if err != nil {
-		return result
-	}
-
-	_ = afero.Walk(fs, worktreeGitDirsPath, func(currPath string, info ioFs.FileInfo, err error) error {
-		if err != nil {
-			return err
-		}
-
-		if !info.IsDir() {
-			return nil
-		}
-
-		gitDirPath := path.Join(currPath, "gitdir")
-		gitDirBytes, err := afero.ReadFile(fs, gitDirPath)
-		if err != nil {
-			// ignoring error
-			return nil
-		}
-		trimmedGitDir := strings.TrimSpace(string(gitDirBytes))
-		// removing the .git part
-		worktreeDir := path.Dir(trimmedGitDir)
-		result = append(result, worktreeDir)
-		return nil
-	})
-
-	return result
-}
@@ -1,118 +0,0 @@
-package git_commands
-
-import (
-	"testing"
-
-	"github.com/go-errors/errors"
-	"github.com/spf13/afero"
-	"github.com/stretchr/testify/assert"
-)
-
-func mockResolveSymlinkFn(p string) (string, error) { return p, nil }
-
-type Scenario struct {
-	Name       string
-	BeforeFunc func(fs afero.Fs)
-	Path       string
-	Expected   *RepoPaths
-	Err        error
-}
-
-func TestGetRepoPathsAux(t *testing.T) {
-	scenarios := []Scenario{
-		{
-			Name: "typical case",
-			BeforeFunc: func(fs afero.Fs) {
-				// setup for main worktree
-				_ = fs.MkdirAll("/path/to/repo/.git", 0o755)
-			},
-			Path: "/path/to/repo",
-			Expected: &RepoPaths{
-				currentPath:        "/path/to/repo",
-				worktreePath:       "/path/to/repo",
-				worktreeGitDirPath: "/path/to/repo/.git",
-				repoPath:           "/path/to/repo",
-				repoGitDirPath:     "/path/to/repo/.git",
-				repoName:           "repo",
-			},
-			Err: nil,
-		},
-		{
-			Name: "linked worktree",
-			BeforeFunc: func(fs afero.Fs) {
-				// setup for linked worktree
-				_ = fs.MkdirAll("/path/to/repo/.git/worktrees/worktree1", 0o755)
-				_ = afero.WriteFile(fs, "/path/to/repo/worktree1/.git", []byte("gitdir: /path/to/repo/.git/worktrees/worktree1"), 0o644)
-			},
-			Path: "/path/to/repo/worktree1",
-			Expected: &RepoPaths{
-				currentPath:        "/path/to/repo/worktree1",
-				worktreePath:       "/path/to/repo/worktree1",
-				worktreeGitDirPath: "/path/to/repo/.git/worktrees/worktree1",
-				repoPath:           "/path/to/repo",
-				repoGitDirPath:     "/path/to/repo/.git",
-				repoName:           "repo",
-			},
-			Err: nil,
-		},
-		{
-			Name: "worktree .git file missing gitdir directive",
-			BeforeFunc: func(fs afero.Fs) {
-				_ = fs.MkdirAll("/path/to/repo/.git/worktrees/worktree2", 0o755)
-				_ = afero.WriteFile(fs, "/path/to/repo/worktree2/.git", []byte("blah"), 0o644)
-			},
-			Path:     "/path/to/repo/worktree2",
-			Expected: nil,
-			Err:      errors.New("failed to get repo git dir path: could not find git dir for /path/to/repo/worktree2: /path/to/repo/worktree2/.git is a file which suggests we are in a submodule or a worktree but the file's contents do not contain a gitdir pointing to the actual .git directory"),
-		},
-		{
-			Name: "worktree .git file gitdir directive points to a non-existing directory",
-			BeforeFunc: func(fs afero.Fs) {
-				_ = fs.MkdirAll("/path/to/repo/.git/worktrees/worktree2", 0o755)
-				_ = afero.WriteFile(fs, "/path/to/repo/worktree2/.git", []byte("gitdir: /nonexistant"), 0o644)
-			},
-			Path:     "/path/to/repo/worktree2",
-			Expected: nil,
-			Err:      errors.New("failed to get repo git dir path: could not find git dir for /path/to/repo/worktree2"),
-		},
-		{
-			Name: "submodule",
-			BeforeFunc: func(fs afero.Fs) {
-				_ = fs.MkdirAll("/path/to/repo/.git/modules/submodule1", 0o755)
-				_ = afero.WriteFile(fs, "/path/to/repo/submodule1/.git", []byte("gitdir: /path/to/repo/.git/modules/submodule1"), 0o644)
-			},
-			Path: "/path/to/repo/submodule1",
-			Expected: &RepoPaths{
-				currentPath:        "/path/to/repo/submodule1",
-				worktreePath:       "/path/to/repo/submodule1",
-				worktreeGitDirPath: "/path/to/repo/.git/modules/submodule1",
-				repoPath:           "/path/to/repo/submodule1",
-				repoGitDirPath:     "/path/to/repo/.git/modules/submodule1",
-				repoName:           "submodule1",
-			},
-			Err: nil,
-		},
-	}
-
-	for _, s := range scenarios {
-		s := s
-		t.Run(s.Name, func(t *testing.T) {
-			fs := afero.NewMemMapFs()
-
-			// prepare the filesystem for the scenario
-			s.BeforeFunc(fs)
-
-			// run the function with the scenario path
-			repoPaths, err := getRepoPathsAux(fs, mockResolveSymlinkFn, s.Path)
-
-			// check the error and the paths
-			if s.Err != nil {
-				assert.Error(t, err)
-				assert.EqualError(t, err, s.Err.Error())
-			} else {
-				assert.Nil(t, err)
-				assert.Equal(t, s.Expected, repoPaths)
-			}
-		})
-	}
-}
@@ -24,14 +24,14 @@ func NewStatusCommands(
 // RebaseMode returns "" for non-rebase mode, "normal" for normal rebase
 // and "interactive" for interactive rebase
 func (self *StatusCommands) RebaseMode() (enums.RebaseMode, error) {
-	exists, err := self.os.FileExists(filepath.Join(self.repoPaths.WorktreeGitDirPath(), "rebase-apply"))
+	exists, err := self.os.FileExists(filepath.Join(self.dotGitDir, "rebase-apply"))
 	if err != nil {
 		return enums.REBASE_MODE_NONE, err
 	}
 	if exists {
 		return enums.REBASE_MODE_NORMAL, nil
 	}
-	exists, err = self.os.FileExists(filepath.Join(self.repoPaths.WorktreeGitDirPath(), "rebase-merge"))
+	exists, err = self.os.FileExists(filepath.Join(self.dotGitDir, "rebase-merge"))
 	if exists {
 		return enums.REBASE_MODE_INTERACTIVE, err
 	} else {
@@ -69,5 +69,5 @@ func IsBareRepo(osCommand *oscommands.OSCommand) (bool, error) {

 // IsInMergeState states whether we are still mid-merge
 func (self *StatusCommands) IsInMergeState() (bool, error) {
-	return self.os.FileExists(filepath.Join(self.repoPaths.WorktreeGitDirPath(), "MERGE_HEAD"))
+	return self.os.FileExists(filepath.Join(self.dotGitDir, "MERGE_HEAD"))
 }
@@ -82,7 +82,7 @@ func (self *SubmoduleCommands) Stash(submodule *models.SubmoduleConfig) error {
 	}

 	cmdArgs := NewGitCmd("stash").
-		Dir(submodule.Path).
+		RepoPath(submodule.Path).
 		Arg("--include-untracked").
 		ToArgv()

@@ -139,9 +139,7 @@ func (self *SubmoduleCommands) Delete(submodule *models.SubmoduleConfig) error {
 		self.Log.Error(err)
 	}

-	// We may in fact want to use the repo's git dir path but git docs say not to
-	// mix submodules and worktrees anyway.
-	return os.RemoveAll(filepath.Join(self.repoPaths.WorktreeGitDirPath(), "modules", submodule.Path))
+	return os.RemoveAll(filepath.Join(self.dotGitDir, "modules", submodule.Path))
 }

 func (self *SubmoduleCommands) Add(name string, path string, url string) error {
@@ -82,7 +82,6 @@ type PullOptions struct {
 	RemoteName      string
 	BranchName      string
 	FastForwardOnly bool
-	WorktreeGitDir  string
 }

 func (self *SyncCommands) Pull(task gocui.Task, opts PullOptions) error {
@@ -91,7 +90,6 @@ func (self *SyncCommands) Pull(task gocui.Task, opts PullOptions) error {
 		ArgIf(opts.FastForwardOnly, "--ff-only").
 		ArgIf(opts.RemoteName != "", opts.RemoteName).
 		ArgIf(opts.BranchName != "", opts.BranchName).
-		GitDirIf(opts.WorktreeGitDir != "", opts.WorktreeGitDir).
 		ToArgv()

 	// setting GIT_SEQUENCE_EDITOR to ':' as a way of skipping it, in case the user
@@ -99,12 +97,7 @@ func (self *SyncCommands) Pull(task gocui.Task, opts PullOptions) error {
 	return self.cmd.New(cmdArgs).AddEnvVars("GIT_SEQUENCE_EDITOR=:").PromptOnCredentialRequest(task).WithMutex(self.syncMutex).Run()
 }

-func (self *SyncCommands) FastForward(
-	task gocui.Task,
-	branchName string,
-	remoteName string,
-	remoteBranchName string,
-) error {
+func (self *SyncCommands) FastForward(task gocui.Task, branchName string, remoteName string, remoteBranchName string) error {
 	cmdArgs := NewGitCmd("fetch").
 		Arg(remoteName).
 		Arg(remoteBranchName + ":" + branchName).
@@ -69,3 +69,7 @@ func (v *GitVersion) IsOlderThan(major, minor, patch int) bool {
 func (v *GitVersion) IsOlderThanVersion(version *GitVersion) bool {
 	return v.IsOlderThan(version.Major, version.Minor, version.Patch)
 }
+
+func (v *GitVersion) SupportsWorktrees() bool {
+	return !v.IsOlderThan(2, 5, 0)
+}
@@ -1,7 +1,11 @@
 package git_commands

 import (
-	"path/filepath"
+	"errors"
+	"fmt"
+	"io/fs"
+	"log"
+	"os"

 	"github.com/jesseduffield/lazygit/pkg/commands/models"
 )
@@ -49,9 +53,38 @@ func (self *WorktreeCommands) Delete(worktreePath string, force bool) error {
 }

 func (self *WorktreeCommands) Detach(worktreePath string) error {
-	cmdArgs := NewGitCmd("checkout").Arg("--detach").GitDir(filepath.Join(worktreePath, ".git")).ToArgv()
+	cmdArgs := NewGitCmd("checkout").Arg("--detach").ToArgv()

-	return self.cmd.New(cmdArgs).Run()
+	return self.cmd.New(cmdArgs).SetWd(worktreePath).Run()
+}
+
+func (self *WorktreeCommands) IsCurrentWorktree(path string) bool {
+	return IsCurrentWorktree(path)
+}
+
+func IsCurrentWorktree(path string) bool {
+	pwd, err := os.Getwd()
+	if err != nil {
+		log.Fatalln(err.Error())
+	}
+
+	return EqualPath(pwd, path)
+}
+
+func (self *WorktreeCommands) IsWorktreePathMissing(path string) bool {
+	if _, err := os.Stat(path); err != nil {
+		if errors.Is(err, fs.ErrNotExist) {
+			return true
+		}
+		log.Fatalln(fmt.Errorf("failed to check if worktree path `%s` exists\n%w", path, err).Error())
+	}
+	return false
+}
+
+// checks if two paths are equal
+// TODO: support relative paths
+func EqualPath(a string, b string) bool {
+	return a == b
 }

 func WorktreeForBranch(branch *models.Branch, worktrees []*models.Worktree) (*models.Worktree, bool) {
@@ -70,5 +103,5 @@ func CheckedOutByOtherWorktree(branch *models.Branch, worktrees []*models.Worktr
 		return false
 	}

-	return !worktree.IsCurrent
+	return !IsCurrentWorktree(worktree.Path)
 }
@@ -1,74 +1,53 @@
 package git_commands

 import (
-	iofs "io/fs"
+	"os"
 	"path/filepath"
 	"strings"

-	"github.com/go-errors/errors"
 	"github.com/jesseduffield/lazygit/pkg/commands/models"
-	"github.com/jesseduffield/lazygit/pkg/utils"
+	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
+	"github.com/jesseduffield/lazygit/pkg/common"
 	"github.com/samber/lo"
-	"github.com/spf13/afero"
 )

 type WorktreeLoader struct {
-	*GitCommon
+	*common.Common
+	cmd oscommands.ICmdObjBuilder
 }

-func NewWorktreeLoader(gitCommon *GitCommon) *WorktreeLoader {
-	return &WorktreeLoader{GitCommon: gitCommon}
+func NewWorktreeLoader(
+	common *common.Common,
+	cmd oscommands.ICmdObjBuilder,
+) *WorktreeLoader {
+	return &WorktreeLoader{
+		Common: common,
+		cmd:    cmd,
+	}
 }

 func (self *WorktreeLoader) GetWorktrees() ([]*models.Worktree, error) {
-	currentRepoPath := self.repoPaths.RepoPath()
-	worktreePath := self.repoPaths.WorktreePath()
-
-	cmdArgs := NewGitCmd("worktree").Arg("list", "--porcelain").ToArgv()
+	cmdArgs := NewGitCmd("worktree").Arg("list", "--porcelain", "-z").ToArgv()
 	worktreesOutput, err := self.cmd.New(cmdArgs).DontLog().RunWithOutput()
 	if err != nil {
 		return nil, err
 	}

-	splitLines := strings.Split(
-		utils.NormalizeLinefeeds(worktreesOutput), "\n",
-	)
+	splitLines := strings.Split(worktreesOutput, "\x00")

 	var worktrees []*models.Worktree
 	var current *models.Worktree
 	for _, splitLine := range splitLines {
-		// worktrees are defined over multiple lines and are separated by blank lines
-		// so if we reach a blank line we're done with the current worktree
 		if len(splitLine) == 0 && current != nil {
 			worktrees = append(worktrees, current)
 			current = nil
 			continue
 		}
-
-		// ignore bare repo (not sure why it's even appearing in this list: it's not a worktree)
-		if splitLine == "bare" {
-			current = nil
-			continue
-		}
-
 		if strings.HasPrefix(splitLine, "worktree ") {
 			path := strings.SplitN(splitLine, " ", 2)[1]
-			isMain := path == currentRepoPath
-			isCurrent := path == worktreePath
-			isPathMissing := self.pathExists(path)
-
-			var gitDir string
-			gitDir, err := worktreeGitDirPath(self.Fs, path)
-			if err != nil {
-				self.Log.Warnf("Could not find git dir for worktree %s: %v", path, err)
-			}
-
 			current = &models.Worktree{
-				IsMain:        isMain,
-				IsCurrent:     isCurrent,
-				IsPathMissing: isPathMissing,
-				Path:          path,
-				GitDir:        gitDir,
+				IsMain: len(worktrees) == 0,
+				Path:   path,
 			}
 		} else if strings.HasPrefix(splitLine, "branch ") {
 			branch := strings.SplitN(splitLine, " ", 2)[1]
@@ -81,12 +60,17 @@ func (self *WorktreeLoader) GetWorktrees() ([]*models.Worktree, error) {
 	}))

 	for index, worktree := range worktrees {
-		worktree.Name = names[index]
+		worktree.NameField = names[index]
+	}
+
+	pwd, err := os.Getwd()
+	if err != nil {
+		return nil, err
 	}

 	// move current worktree to the top
 	for i, worktree := range worktrees {
-		if worktree.IsCurrent {
+		if EqualPath(worktree.Path, pwd) {
 			worktrees = append(worktrees[:i], worktrees[i+1:]...)
 			worktrees = append([]*models.Worktree{worktree}, worktrees...)
 			break
@@ -103,58 +87,54 @@ func (self *WorktreeLoader) GetWorktrees() ([]*models.Worktree, error) {
 			continue
 		}

-		// If we couldn't find the git directory, we can't find the branch name
-		if worktree.GitDir == "" {
-			continue
-		}
-
-		rebasedBranch, ok := self.rebasedBranch(worktree)
+		rebaseBranch, ok := rebaseBranch(worktree.Path)
 		if ok {
-			worktree.Branch = rebasedBranch
-			continue
-		}
-
-		bisectedBranch, ok := self.bisectedBranch(worktree)
-		if ok {
-			worktree.Branch = bisectedBranch
-			continue
+			worktree.Branch = rebaseBranch
 		}
 	}

 	return worktrees, nil
 }

-func (self *WorktreeLoader) pathExists(path string) bool {
-	if _, err := self.Fs.Stat(path); err != nil {
-		if errors.Is(err, iofs.ErrNotExist) {
-			return true
-		}
-		self.Log.Errorf("failed to check if worktree path `%s` exists\n%v", path, err)
-		return false
-	}
-	return false
-}
-
-func (self *WorktreeLoader) rebasedBranch(worktree *models.Worktree) (string, bool) {
-	for _, dir := range []string{"rebase-merge", "rebase-apply"} {
-		if bytesContent, err := afero.ReadFile(self.Fs, filepath.Join(worktree.GitDir, dir, "head-name")); err == nil {
-			headName := strings.TrimSpace(string(bytesContent))
-			shortHeadName := strings.TrimPrefix(headName, "refs/heads/")
-			return shortHeadName, true
-		}
+func rebaseBranch(worktreePath string) (string, bool) {
+	// need to find the actual path of the worktree in the .git dir
+	gitPath, ok := WorktreeGitPath(worktreePath)
+	if !ok {
+		return "", false
 	}

-	return "", false
-}
-
-func (self *WorktreeLoader) bisectedBranch(worktree *models.Worktree) (string, bool) {
-	bisectStartPath := filepath.Join(worktree.GitDir, "BISECT_START")
-	startContent, err := afero.ReadFile(self.Fs, bisectStartPath)
+	// now we look inside that git path for a file `rebase-merge/head-name`
+	// if it exists, we update the worktree to say that it has that for a head
+	headNameContents, err := os.ReadFile(filepath.Join(gitPath, "rebase-merge", "head-name"))
 	if err != nil {
 		return "", false
 	}

-	return strings.TrimSpace(string(startContent)), true
+	headName := strings.TrimSpace(string(headNameContents))
+	shortHeadName := strings.TrimPrefix(headName, "refs/heads/")
+
+	return shortHeadName, true
+}
+
+func WorktreeGitPath(worktreePath string) (string, bool) {
+	// first we get the path of the worktree, then we look at the contents of the `.git` file in that path
+	// then we look for the line that says `gitdir: /path/to/.git/worktrees/<worktree-name>`
+	// then we return that path
+	gitFileContents, err := os.ReadFile(filepath.Join(worktreePath, ".git"))
+	if err != nil {
+		return "", false
+	}
+
+	gitDirLine := lo.Filter(strings.Split(string(gitFileContents), "\n"), func(line string, _ int) bool {
+		return strings.HasPrefix(line, "gitdir: ")
+	})
+
+	if len(gitDirLine) == 0 {
+		return "", false
+	}
+
+	gitDir := strings.TrimPrefix(gitDirLine[0], "gitdir: ")
+	return gitDir, true
 }

 type pathWithIndexT struct {
@@ -3,195 +3,9 @@ package git_commands
 import (
 	"testing"

-	"github.com/go-errors/errors"
-	"github.com/jesseduffield/lazygit/pkg/commands/models"
-	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
-	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
 )

-func TestGetWorktrees(t *testing.T) {
-	type scenario struct {
-		testName          string
-		repoPaths         *RepoPaths
-		before            func(runner *oscommands.FakeCmdObjRunner, fs afero.Fs)
-		expectedWorktrees []*models.Worktree
-		expectedErr       string
-	}
-
-	scenarios := []scenario{
-		{
-			testName: "Single worktree (main)",
-			repoPaths: &RepoPaths{
-				repoPath:     "/path/to/repo",
-				worktreePath: "/path/to/repo",
-			},
-			before: func(runner *oscommands.FakeCmdObjRunner, fs afero.Fs) {
-				runner.ExpectGitArgs([]string{"worktree", "list", "--porcelain"},
-					`worktree /path/to/repo
-HEAD d85cc9d281fa6ae1665c68365fc70e75e82a042d
-branch refs/heads/mybranch
-`,
-					nil)
-
-				_ = fs.MkdirAll("/path/to/repo/.git", 0o755)
-			},
-			expectedWorktrees: []*models.Worktree{
-				{
-					IsMain:        true,
-					IsCurrent:     true,
-					Path:          "/path/to/repo",
-					IsPathMissing: false,
-					GitDir:        "/path/to/repo/.git",
-					Branch:        "mybranch",
-					Name:          "repo",
-				},
-			},
-			expectedErr: "",
-		},
-		{
-			testName: "Multiple worktrees (main + linked)",
-			repoPaths: &RepoPaths{
-				repoPath:     "/path/to/repo",
-				worktreePath: "/path/to/repo",
-			},
-			before: func(runner *oscommands.FakeCmdObjRunner, fs afero.Fs) {
-				runner.ExpectGitArgs([]string{"worktree", "list", "--porcelain"},
-					`worktree /path/to/repo
-HEAD d85cc9d281fa6ae1665c68365fc70e75e82a042d
-branch refs/heads/mybranch
-
-worktree /path/to/repo-worktree
-HEAD 775955775e79b8f5b4c4b56f82fbf657e2d5e4de
-branch refs/heads/mybranch-worktree
-`,
-					nil)
-
-				_ = fs.MkdirAll("/path/to/repo/.git", 0o755)
-				_ = fs.MkdirAll("/path/to/repo-worktree", 0o755)
-				_ = fs.MkdirAll("/path/to/repo/.git/worktrees/repo-worktree", 0o755)
-				_ = afero.WriteFile(fs, "/path/to/repo-worktree/.git", []byte("gitdir: /path/to/repo/.git/worktrees/repo-worktree"), 0o755)
-			},
-			expectedWorktrees: []*models.Worktree{
-				{
-					IsMain:        true,
-					IsCurrent:     true,
-					Path:          "/path/to/repo",
-					IsPathMissing: false,
-					GitDir:        "/path/to/repo/.git",
-					Branch:        "mybranch",
-					Name:          "repo",
-				},
-				{
-					IsMain:        false,
-					IsCurrent:     false,
-					Path:          "/path/to/repo-worktree",
-					IsPathMissing: false,
-					GitDir:        "/path/to/repo/.git/worktrees/repo-worktree",
-					Branch:        "mybranch-worktree",
-					Name:          "repo-worktree",
-				},
-			},
-			expectedErr: "",
-		},
-		{
-			testName: "Worktree missing path",
-			repoPaths: &RepoPaths{
-				repoPath:     "/path/to/repo",
-				worktreePath: "/path/to/repo",
-			},
-			before: func(runner *oscommands.FakeCmdObjRunner, fs afero.Fs) {
-				runner.ExpectGitArgs([]string{"worktree", "list", "--porcelain"},
-					`worktree /path/to/worktree
-HEAD 775955775e79b8f5b4c4b56f82fbf657e2d5e4de
-branch refs/heads/missingbranch
-`,
-					nil)
-
-				_ = fs.MkdirAll("/path/to/repo/.git", 0o755)
-			},
-			expectedWorktrees: []*models.Worktree{
-				{
-					IsMain:        false,
-					IsCurrent:     false,
-					Path:          "/path/to/worktree",
-					IsPathMissing: true,
-					GitDir:        "",
-					Branch:        "missingbranch",
-					Name:          "worktree",
-				},
-			},
-			expectedErr: "",
-		},
-		{
-			testName: "In linked worktree",
-			repoPaths: &RepoPaths{
-				repoPath:     "/path/to/repo",
-				worktreePath: "/path/to/repo-worktree",
-			},
-			before: func(runner *oscommands.FakeCmdObjRunner, fs afero.Fs) {
-				runner.ExpectGitArgs([]string{"worktree", "list", "--porcelain"},
-					`worktree /path/to/repo
-HEAD d85cc9d281fa6ae1665c68365fc70e75e82a042d
-branch refs/heads/mybranch
-
-worktree /path/to/repo-worktree
-HEAD 775955775e79b8f5b4c4b56f82fbf657e2d5e4de
-branch refs/heads/mybranch-worktree
-`,
-					nil)
-
-				_ = fs.MkdirAll("/path/to/repo/.git", 0o755)
-				_ = fs.MkdirAll("/path/to/repo-worktree", 0o755)
-				_ = fs.MkdirAll("/path/to/repo/.git/worktrees/repo-worktree", 0o755)
-				_ = afero.WriteFile(fs, "/path/to/repo-worktree/.git", []byte("gitdir: /path/to/repo/.git/worktrees/repo-worktree"), 0o755)
-			},
-			expectedWorktrees: []*models.Worktree{
-				{
-					IsMain:        false,
-					IsCurrent:     true,
-					Path:          "/path/to/repo-worktree",
-					IsPathMissing: false,
-					GitDir:        "/path/to/repo/.git/worktrees/repo-worktree",
-					Branch:        "mybranch-worktree",
-					Name:          "repo-worktree",
-				},
-				{
-					IsMain:        true,
-					IsCurrent:     false,
-					Path:          "/path/to/repo",
-					IsPathMissing: false,
-					GitDir:        "/path/to/repo/.git",
-					Branch:        "mybranch",
-					Name:          "repo",
-				},
-			},
-			expectedErr: "",
-		},
-	}
-
-	for _, s := range scenarios {
-		s := s
-		t.Run(s.testName, func(t *testing.T) {
-			runner := oscommands.NewFakeRunner(t)
-			fs := afero.NewMemMapFs()
-			s.before(runner, fs)
-
-			loader := &WorktreeLoader{
-				GitCommon: buildGitCommon(commonDeps{runner: runner, fs: fs, repoPaths: s.repoPaths}),
-			}
-
-			worktrees, err := loader.GetWorktrees()
-			if s.expectedErr != "" {
-				assert.EqualError(t, errors.New(s.expectedErr), err.Error())
-			} else {
-				assert.NoError(t, err)
-				assert.EqualValues(t, worktrees, s.expectedWorktrees)
-			}
-		})
-	}
-}
-
 func TestGetUniqueNamesFromPaths(t *testing.T) {
 	for _, scenario := range []struct {
 		input    []string
@@ -1,74 +1,305 @@
 package commands

 import (
+	"fmt"
+	"os"
 	"testing"
+	"time"

 	"github.com/go-errors/errors"
-	"github.com/spf13/afero"
+	gogit "github.com/jesseduffield/go-git/v5"
+	"github.com/jesseduffield/lazygit/pkg/commands/git_commands"
+	"github.com/jesseduffield/lazygit/pkg/commands/git_config"
+	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
+	"github.com/jesseduffield/lazygit/pkg/utils"
+	"github.com/sasha-s/go-deadlock"
 	"github.com/stretchr/testify/assert"
 )

-func TestFindWorktreeRoot(t *testing.T) {
+type fileInfoMock struct {
+	name        string
+	size        int64
+	fileMode    os.FileMode
+	fileModTime time.Time
+	isDir       bool
+	sys         interface{}
+}
+
+// Name is a function.
+func (f fileInfoMock) Name() string {
+	return f.name
+}
+
+// Size is a function.
+func (f fileInfoMock) Size() int64 {
+	return f.size
+}
+
+// Mode is a function.
+func (f fileInfoMock) Mode() os.FileMode {
+	return f.fileMode
+}
+
+// ModTime is a function.
+func (f fileInfoMock) ModTime() time.Time {
+	return f.fileModTime
+}
+
+// IsDir is a function.
+func (f fileInfoMock) IsDir() bool {
+	return f.isDir
+}
+
+// Sys is a function.
+func (f fileInfoMock) Sys() interface{} {
+	return f.sys
+}
+
+// TestNavigateToRepoRootDirectory is a function.
+func TestNavigateToRepoRootDirectory(t *testing.T) {
 	type scenario struct {
-		testName     string
-		currentPath  string
-		before       func(fs afero.Fs)
-		expectedPath string
-		expectedErr  string
+		testName string
+		stat     func(string) (os.FileInfo, error)
+		chdir    func(string) error
+		test     func(error)
 	}

 	scenarios := []scenario{
 		{
-			testName:    "at root of worktree",
-			currentPath: "/path/to/repo",
-			before: func(fs afero.Fs) {
-				_ = fs.MkdirAll("/path/to/repo/.git", 0o755)
+			"Navigate to git repository",
+			func(string) (os.FileInfo, error) {
+				return fileInfoMock{isDir: true}, nil
+			},
+			func(string) error {
+				return nil
+			},
+			func(err error) {
+				assert.NoError(t, err)
 			},
-			expectedPath: "/path/to/repo",
-			expectedErr:  "",
 		},
 		{
-			testName:    "inside worktree",
-			currentPath: "/path/to/repo/subdir",
-			before: func(fs afero.Fs) {
-				_ = fs.MkdirAll("/path/to/repo/.git", 0o755)
-				_ = fs.MkdirAll("/path/to/repo/subdir", 0o755)
+			"An error occurred when getting path information",
+			func(string) (os.FileInfo, error) {
+				return nil, fmt.Errorf("An error occurred")
+			},
+			func(string) error {
+				return nil
+			},
+			func(err error) {
+				assert.Error(t, err)
+				assert.EqualError(t, err, "An error occurred")
 			},
-			expectedPath: "/path/to/repo",
-			expectedErr:  "",
 		},
 		{
-			testName:     "not in a git repo",
-			currentPath:  "/path/to/dir",
-			before:       func(fs afero.Fs) {},
-			expectedPath: "",
-			expectedErr:  "Must open lazygit in a git repository",
-		},
-		{
-			testName:    "In linked worktree",
-			currentPath: "/path/to/worktree",
-			before: func(fs afero.Fs) {
-				_ = fs.MkdirAll("/path/to/worktree", 0o755)
-				_ = afero.WriteFile(fs, "/path/to/worktree/.git", []byte("blah"), 0o755)
+			"An error occurred when trying to move one path backward",
+			func(string) (os.FileInfo, error) {
+				return nil, os.ErrNotExist
+			},
+			func(string) error {
+				return fmt.Errorf("An error occurred")
+			},
+			func(err error) {
+				assert.Error(t, err)
+				assert.EqualError(t, err, "An error occurred")
 			},
-			expectedPath: "/path/to/worktree",
-			expectedErr:  "",
 		},
 	}

 	for _, s := range scenarios {
 		s := s
 		t.Run(s.testName, func(t *testing.T) {
-			fs := afero.NewMemMapFs()
-			s.before(fs)
+			s.test(navigateToRepoRootDirectory(s.stat, s.chdir))
+		})
+	}
+}

-			root, err := findWorktreeRoot(fs, s.currentPath)
-			if s.expectedErr != "" {
-				assert.EqualError(t, errors.New(s.expectedErr), err.Error())
-			} else {
+// TestSetupRepository is a function.
+func TestSetupRepository(t *testing.T) {
+	type scenario struct {
+		testName          string
+		openGitRepository func(string, *gogit.PlainOpenOptions) (*gogit.Repository, error)
+		errorStr          string
+		options           gogit.PlainOpenOptions
+		test              func(*gogit.Repository, error)
+	}
+
+	scenarios := []scenario{
+		{
+			"A gitconfig parsing error occurred",
+			func(string, *gogit.PlainOpenOptions) (*gogit.Repository, error) {
+				return nil, fmt.Errorf(`unquoted '\' must be followed by new line`)
+			},
+			"error translated",
+			gogit.PlainOpenOptions{},
+			func(r *gogit.Repository, err error) {
+				assert.Error(t, err)
+				assert.EqualError(t, err, "error translated")
+			},
+		},
+		{
+			"A gogit error occurred",
+			func(string, *gogit.PlainOpenOptions) (*gogit.Repository, error) {
+				return nil, fmt.Errorf("Error from inside gogit")
+			},
+			"",
+			gogit.PlainOpenOptions{},
+			func(r *gogit.Repository, err error) {
+				assert.Error(t, err)
+				assert.EqualError(t, err, "Error from inside gogit")
+			},
+		},
+		{
+			"Setup done properly",
+			func(string, *gogit.PlainOpenOptions) (*gogit.Repository, error) {
+				assert.NoError(t, os.RemoveAll("/tmp/lazygit-test"))
+				r, err := gogit.PlainInit("/tmp/lazygit-test", false)
+				assert.NoError(t, err)
+				return r, nil
+			},
+			"",
+			gogit.PlainOpenOptions{},
+			func(r *gogit.Repository, err error) {
+				assert.NoError(t, err)
+				assert.NotNil(t, r)
+			},
+		},
+	}
+
+	for _, s := range scenarios {
+		s := s
+		t.Run(s.testName, func(t *testing.T) {
+			s.test(setupRepository(s.openGitRepository, s.options, s.errorStr))
+		})
+	}
+}
+
+// TestNewGitCommand is a function.
+func TestNewGitCommand(t *testing.T) {
+	actual, err := os.Getwd()
+	assert.NoError(t, err)
+
+	defer func() {
+		assert.NoError(t, os.Chdir(actual))
+	}()
+
+	type scenario struct {
+		testName string
+		setup    func()
+		test     func(*GitCommand, error)
+	}
+
+	scenarios := []scenario{
+		{
+			"An error occurred, folder doesn't contains a git repository",
+			func() {
+				assert.NoError(t, os.Chdir("/tmp"))
+			},
+			func(gitCmd *GitCommand, err error) {
+				assert.Error(t, err)
+				assert.Regexp(t, `Must open lazygit in a git repository`, err.Error())
+			},
+		},
+		{
+			"New GitCommand object created",
+			func() {
+				assert.NoError(t, os.RemoveAll("/tmp/lazygit-test"))
+				_, err := gogit.PlainInit("/tmp/lazygit-test", false)
 				assert.NoError(t, err)
-				assert.Equal(t, s.expectedPath, root)
-			}
+				assert.NoError(t, os.Chdir("/tmp/lazygit-test"))
+			},
+			func(gitCmd *GitCommand, err error) {
+				assert.NoError(t, err)
+			},
+		},
+	}
+
+	for _, s := range scenarios {
+		s := s
+		t.Run(s.testName, func(t *testing.T) {
+			s.setup()
+			s.test(
+				NewGitCommand(utils.NewDummyCommon(),
+					&git_commands.GitVersion{},
+					oscommands.NewDummyOSCommand(),
+					git_config.NewFakeGitConfig(nil),
+					&deadlock.Mutex{},
+				))
+		})
+	}
+}
+
+func TestFindDotGitDir(t *testing.T) {
+	type scenario struct {
+		testName string
+		stat     func(string) (os.FileInfo, error)
+		readFile func(filename string) ([]byte, error)
+		test     func(string, error)
+	}
+
+	scenarios := []scenario{
+		{
+			".git is a directory",
+			func(dotGit string) (os.FileInfo, error) {
+				assert.Equal(t, ".git", dotGit)
+				return os.Stat("testdata/a_dir")
+			},
+			func(dotGit string) ([]byte, error) {
+				assert.Fail(t, "readFile should not be called if .git is a directory")
+				return nil, nil
+			},
+			func(gitDir string, err error) {
+				assert.NoError(t, err)
+				assert.Equal(t, ".git", gitDir)
+			},
+		},
+		{
+			".git is a file",
+			func(dotGit string) (os.FileInfo, error) {
+				assert.Equal(t, ".git", dotGit)
+				return os.Stat("testdata/a_file")
+			},
+			func(dotGit string) ([]byte, error) {
+				assert.Equal(t, ".git", dotGit)
+				return []byte("gitdir: blah\n"), nil
+			},
+			func(gitDir string, err error) {
+				assert.NoError(t, err)
+				assert.Equal(t, "blah", gitDir)
+			},
+		},
+		{
+			"os.Stat returns an error",
+			func(dotGit string) (os.FileInfo, error) {
+				assert.Equal(t, ".git", dotGit)
+				return nil, errors.New("error")
+			},
+			func(dotGit string) ([]byte, error) {
+				assert.Fail(t, "readFile should not be called os.Stat returns an error")
+				return nil, nil
+			},
+			func(gitDir string, err error) {
+				assert.Error(t, err)
+			},
+		},
+		{
+			"readFile returns an error",
+			func(dotGit string) (os.FileInfo, error) {
+				assert.Equal(t, ".git", dotGit)
+				return os.Stat("testdata/a_file")
+			},
+			func(dotGit string) ([]byte, error) {
+				return nil, errors.New("error")
+			},
+			func(gitDir string, err error) {
+				assert.Error(t, err)
+			},
+		},
+	}
+
+	for _, s := range scenarios {
+		s := s
+		t.Run(s.testName, func(t *testing.T) {
+			s.test(findDotGitDir(s.stat, s.readFile))
 		})
 	}
 }
@@ -1,13 +0,0 @@
-package models
-
-import "fmt"
-
-// A commit author
-type Author struct {
-	Name  string
-	Email string
-}
-
-func (self *Author) Combined() string {
-	return fmt.Sprintf("%s <%s>", self.Name, self.Email)
-}
@@ -18,10 +18,8 @@ type File struct {
 	HasMergeConflicts       bool
 	HasInlineMergeConflicts bool
 	DisplayString           string
+	Type                    string // one of 'file', 'directory', and 'other'
 	ShortStatus             string // e.g. 'AD', ' A', 'M ', '??'
-
-	// If true, this must be a worktree folder
-	IsWorktree bool
 }

 // sometimes we need to deal with either a node (which contains a file) or an actual file
@@ -4,28 +4,14 @@ package models
 type Worktree struct {
 	// if false, this is a linked worktree
 	IsMain bool
-	// if true, this is the worktree that is currently checked out
-	IsCurrent bool
-	// path to the directory of the worktree i.e. the directory that contains all the user's files
-	Path string
-	// if true, the path is not found
-	IsPathMissing bool
-	// path of the git directory for this worktree. The equivalent of the .git directory
-	// in the main worktree. For linked worktrees this would be <repo_path>/.git/worktrees/<name>
-	GitDir string
-	// If the worktree has a branch checked out, this field will be set to the branch name.
-	// A branch is considered 'checked out' if:
-	// * the worktree is directly on the branch
-	// * the worktree is mid-rebase on the branch
-	// * the worktree is mid-bisect on the branch
+	Path   string
 	Branch string
-	// based on the path, but uniquified. Not the same name that git uses in the worktrees/ folder (no good reason for this,
-	// I just prefer my naming convention better)
-	Name string
+	// based on the path, but uniquified
+	NameField string
 }

 func (w *Worktree) RefName() string {
-	return w.Name
+	return w.Name()
 }

 func (w *Worktree) ID() string {
@@ -35,3 +21,11 @@ func (w *Worktree) ID() string {
 func (w *Worktree) Description() string {
 	return w.RefName()
 }
+
+func (w *Worktree) Name() string {
+	return w.NameField
+}
+
+func (w *Worktree) Main() bool {
+	return w.IsMain
+}
@@ -6,7 +6,6 @@ import (
 	"io"
 	"regexp"
 	"strings"
-	"time"

 	"github.com/go-errors/errors"
 	"github.com/jesseduffield/gocui"
@@ -103,14 +102,10 @@ func (self *cmdObjRunner) RunWithOutputAux(cmdObj ICmdObj) (string, error) {
 		self.logCmdObj(cmdObj)
 	}

-	t := time.Now()
 	output, err := sanitisedCommandOutput(cmdObj.GetCmd().CombinedOutput())
 	if err != nil {
 		self.log.WithField("command", cmdObj.ToString()).Error(output)
 	}
-
-	self.log.Infof("%s (%s)", cmdObj.ToString(), time.Since(t))
-
 	return output, err
 }

@@ -121,15 +116,12 @@ func (self *cmdObjRunner) RunWithOutputsAux(cmdObj ICmdObj) (string, string, err
 		self.logCmdObj(cmdObj)
 	}

-	t := time.Now()
 	var outBuffer, errBuffer bytes.Buffer
 	cmd := cmdObj.GetCmd()
 	cmd.Stdout = &outBuffer
 	cmd.Stderr = &errBuffer
 	err := cmd.Run()

-	self.log.Infof("%s (%s)", cmdObj.ToString(), time.Since(t))
-
 	stdout := outBuffer.String()
 	stderr, err := sanitisedCommandOutput(errBuffer.Bytes(), err)
 	if err != nil {
@@ -152,7 +144,6 @@ func (self *cmdObjRunner) RunAndProcessLines(cmdObj ICmdObj, onLine func(line st
 	if cmdObj.ShouldLog() {
 		self.logCmdObj(cmdObj)
 	}
-	t := time.Now()

 	cmd := cmdObj.GetCmd()
 	stdoutPipe, err := cmd.StdoutPipe()
@@ -180,8 +171,6 @@ func (self *cmdObjRunner) RunAndProcessLines(cmdObj ICmdObj, onLine func(line st

 	_ = cmd.Wait()

-	self.log.Infof("%s (%s)", cmdObj.ToString(), time.Since(t))
-
 	return nil
 }

@@ -248,14 +237,9 @@ func (self *cmdObjRunner) runAndStreamAux(
 		}
 	}()

-	t := time.Now()
-
 	onRun(handler, cmdWriter)

 	err = cmd.Wait()
-
-	self.log.Infof("%s (%s)", cmdObj.ToString(), time.Since(t))
-
 	if err != nil {
 		errStr := stderr.String()
 		if errStr != "" {
@@ -328,9 +312,7 @@ func (self *cmdObjRunner) runAndDetectCredentialRequest(
 	return self.runAndStreamAux(cmdObj, func(handler *cmdHandler, cmdWriter io.Writer) {
 		tr := io.TeeReader(handler.stdoutPipe, cmdWriter)

-		go utils.Safe(func() {
-			self.processOutput(tr, handler.stdinPipe, promptUserForCredential, cmdObj.GetTask())
-		})
+		self.processOutput(tr, handler.stdinPipe, promptUserForCredential, cmdObj.GetTask())
 	})
 }

@@ -349,13 +331,9 @@ func (self *cmdObjRunner) processOutput(
 		askFor, ok := checkForCredentialRequest(newBytes)
 		if ok {
 			responseChan := promptUserForCredential(askFor)
-			if task != nil {
-				task.Pause()
-			}
+			task.Pause()
 			toInput := <-responseChan
-			if task != nil {
-				task.Continue()
-			}
+			task.Continue()
 			// If the return data is empty we don't write anything to stdin
 			if toInput != "" {
 				_, _ = writer.Write([]byte(toInput))
@@ -6,36 +6,18 @@ import (
 	"regexp"
 	"runtime"
 	"strings"
-	"sync"
 	"testing"

 	"github.com/go-errors/errors"
-	"github.com/samber/lo"
-	"golang.org/x/exp/slices"
+	"github.com/stretchr/testify/assert"
 )

 // for use in testing

 type FakeCmdObjRunner struct {
-	t *testing.T
-	// commands can be run in any order; mimicking the concurrent behaviour of
-	// production code.
-	expectedCmds []CmdObjMatcher
-
-	invokedCmdIndexes []int
-
-	mutex sync.Mutex
-}
-
-type CmdObjMatcher struct {
-	description string
-	// returns true if the matcher matches the command object
-	test func(ICmdObj) bool
-
-	// output of the command
-	output string
-	// error of the command
-	err error
+	t                *testing.T
+	expectedCmds     []func(ICmdObj) (string, error)
+	expectedCmdIndex int
 }

 var _ ICmdObjRunner = &FakeCmdObjRunner{}
@@ -44,40 +26,23 @@ func NewFakeRunner(t *testing.T) *FakeCmdObjRunner { //nolint:thelper
 	return &FakeCmdObjRunner{t: t}
 }

-func (self *FakeCmdObjRunner) remainingExpectedCmds() []CmdObjMatcher {
-	return lo.Filter(self.expectedCmds, func(_ CmdObjMatcher, i int) bool {
-		return !lo.Contains(self.invokedCmdIndexes, i)
-	})
-}
-
 func (self *FakeCmdObjRunner) Run(cmdObj ICmdObj) error {
 	_, err := self.RunWithOutput(cmdObj)
 	return err
 }

 func (self *FakeCmdObjRunner) RunWithOutput(cmdObj ICmdObj) (string, error) {
-	self.mutex.Lock()
-	defer self.mutex.Unlock()
-
-	if len(self.remainingExpectedCmds()) == 0 {
+	if self.expectedCmdIndex > len(self.expectedCmds)-1 {
 		self.t.Errorf("ran too many commands. Unexpected command: `%s`", cmdObj.ToString())
 		return "", errors.New("ran too many commands")
 	}

-	for i := range self.expectedCmds {
-		if lo.Contains(self.invokedCmdIndexes, i) {
-			continue
-		}
-		expectedCmd := self.expectedCmds[i]
-		matched := expectedCmd.test(cmdObj)
-		if matched {
-			self.invokedCmdIndexes = append(self.invokedCmdIndexes, i)
-			return expectedCmd.output, expectedCmd.err
-		}
-	}
+	expectedCmd := self.expectedCmds[self.expectedCmdIndex]
+	output, err := expectedCmd(cmdObj)

-	self.t.Errorf("Unexpected command: `%s`", cmdObj.ToString())
-	return "", nil
+	self.expectedCmdIndex++
+
+	return output, err
 }

 func (self *FakeCmdObjRunner) RunWithOutputs(cmdObj ICmdObj) (string, string, error) {
@@ -107,84 +72,63 @@ func (self *FakeCmdObjRunner) RunAndProcessLines(cmdObj ICmdObj, onLine func(lin
 	return nil
 }

-func (self *FakeCmdObjRunner) ExpectFunc(description string, fn func(cmdObj ICmdObj) bool, output string, err error) *FakeCmdObjRunner {
-	self.mutex.Lock()
-	defer self.mutex.Unlock()
+func (self *FakeCmdObjRunner) ExpectFunc(fn func(cmdObj ICmdObj) (string, error)) *FakeCmdObjRunner {
+	self.expectedCmds = append(self.expectedCmds, fn)

-	self.expectedCmds = append(self.expectedCmds, CmdObjMatcher{
-		test:        fn,
-		output:      output,
-		err:         err,
-		description: description,
+	return self
+}
+
+func (self *FakeCmdObjRunner) Expect(expectedCmdStr string, output string, err error) *FakeCmdObjRunner {
+	self.ExpectFunc(func(cmdObj ICmdObj) (string, error) {
+		cmdStr := cmdObj.ToString()
+		assert.Equal(self.t, expectedCmdStr, cmdStr, fmt.Sprintf("expected command %d to be %s, but was %s", self.expectedCmdIndex+1, expectedCmdStr, cmdStr))
+
+		return output, err
 	})

 	return self
 }

 func (self *FakeCmdObjRunner) ExpectArgs(expectedArgs []string, output string, err error) *FakeCmdObjRunner {
-	description := fmt.Sprintf("matches args %s", strings.Join(expectedArgs, " "))
-	self.ExpectFunc(description, func(cmdObj ICmdObj) bool {
+	self.ExpectFunc(func(cmdObj ICmdObj) (string, error) {
 		args := cmdObj.GetCmd().Args

 		if runtime.GOOS == "windows" {
 			// thanks to the secureexec package, the first arg is something like
 			// '"C:\\Program Files\\Git\\mingw64\\bin\\<command>.exe"
 			// on windows so we'll just ensure it contains our program
-			if !strings.Contains(args[0], expectedArgs[0]) {
-				return false
-			}
+			assert.Contains(self.t, args[0], expectedArgs[0])
 		} else {
 			// first arg is the program name
-			if expectedArgs[0] != args[0] {
-				return false
-			}
+			assert.Equal(self.t, expectedArgs[0], args[0])
 		}

-		if !slices.Equal(expectedArgs[1:], args[1:]) {
-			return false
-		}
+		assert.EqualValues(self.t, expectedArgs[1:], args[1:], fmt.Sprintf("command %d did not match expectation", self.expectedCmdIndex+1))

-		return true
-	}, output, err)
+		return output, err
+	})

 	return self
 }

 func (self *FakeCmdObjRunner) ExpectGitArgs(expectedArgs []string, output string, err error) *FakeCmdObjRunner {
-	description := fmt.Sprintf("matches git args %s", strings.Join(expectedArgs, " "))
-	self.ExpectFunc(description, func(cmdObj ICmdObj) bool {
+	self.ExpectFunc(func(cmdObj ICmdObj) (string, error) {
 		// first arg is 'git' on unix and something like '"C:\\Program Files\\Git\\mingw64\\bin\\git.exe" on windows so we'll just ensure it ends in either 'git' or 'git.exe'
 		re := regexp.MustCompile(`git(\.exe)?$`)
 		args := cmdObj.GetCmd().Args
 		if !re.MatchString(args[0]) {
-			return false
+			self.t.Errorf("expected first arg to end in .git or .git.exe but was %s", args[0])
 		}
+		assert.EqualValues(self.t, expectedArgs, args[1:], fmt.Sprintf("command %d did not match expectation", self.expectedCmdIndex+1))

-		if !slices.Equal(expectedArgs, args[1:]) {
-			return false
-		}
-
-		return true
-	}, output, err)
+		return output, err
+	})

 	return self
 }

 func (self *FakeCmdObjRunner) CheckForMissingCalls() {
-	self.mutex.Lock()
-	defer self.mutex.Unlock()
-
-	remaining := self.remainingExpectedCmds()
-	if len(remaining) > 0 {
-		self.t.Errorf(
-			"expected %d more command(s) to be run. Remaining commands:\n%s",
-			len(remaining),
-			strings.Join(
-				lo.Map(remaining, func(cmdObj CmdObjMatcher, _ int) string {
-					return cmdObj.description
-				}),
-				"\n",
-			),
-		)
+	if self.expectedCmdIndex < len(self.expectedCmds) {
+		self.t.Errorf("expected command %d to be called, but was not", self.expectedCmdIndex+1)
 	}
 }
@@ -4,7 +4,6 @@ import (
 	"github.com/jesseduffield/lazygit/pkg/config"
 	"github.com/jesseduffield/lazygit/pkg/i18n"
 	"github.com/sirupsen/logrus"
-	"github.com/spf13/afero"
 )

 // Commonly used things wrapped into one struct for convenience when passing it around
@@ -13,7 +12,4 @@ type Common struct {
 	Tr         *i18n.TranslationSet
 	UserConfig *config.UserConfig
 	Debug      bool
-	// for interacting with the filesystem. We use afero rather than the default
-	// `os` package for the sake of mocking the filesystem in tests
-	Fs afero.Fs
 }
@@ -8,7 +8,7 @@ import (

 	"github.com/OpenPeeDeeP/xdg"
 	"github.com/jesseduffield/lazygit/pkg/utils/yaml_utils"
-	yaml "github.com/jesseduffield/yaml"
+	"gopkg.in/yaml.v3"
 )

 // AppConfig contains the base configuration fields required for lazygit.
@@ -1,7 +1,7 @@
 package config

 import (
-	yaml "github.com/jesseduffield/yaml"
+	"gopkg.in/yaml.v3"
 )

 // NewDummyAppConfig creates a new dummy AppConfig for testing
@@ -28,20 +28,10 @@ func GetEditAtLineAndWaitTemplate(osConfig *OSConfig, guessDefaultEditor func()
 	return template
 }

-func GetOpenDirInEditorTemplate(osConfig *OSConfig, guessDefaultEditor func() string) string {
-	preset := getPreset(osConfig, guessDefaultEditor)
-	template := osConfig.OpenDirInEditor
-	if template == "" {
-		template = preset.openDirInEditorTemplate
-	}
-	return template
-}
-
 type editPreset struct {
 	editTemplate              string
 	editAtLineTemplate        string
 	editAtLineAndWaitTemplate string
-	openDirInEditorTemplate   string
 	editInTerminal            bool
 }

@@ -58,35 +48,30 @@ func getPreset(osConfig *OSConfig, guessDefaultEditor func() string) *editPreset
 			editTemplate:              "hx -- {{filename}}",
 			editAtLineTemplate:        "hx -- {{filename}}:{{line}}",
 			editAtLineAndWaitTemplate: "hx -- {{filename}}:{{line}}",
-			openDirInEditorTemplate:   "hx -- {{dir}}",
 			editInTerminal:            true,
 		},
 		"vscode": {
 			editTemplate:              "code --reuse-window -- {{filename}}",
 			editAtLineTemplate:        "code --reuse-window --goto -- {{filename}}:{{line}}",
 			editAtLineAndWaitTemplate: "code --reuse-window --goto --wait -- {{filename}}:{{line}}",
-			openDirInEditorTemplate:   "code -- {{dir}}",
 			editInTerminal:            false,
 		},
 		"sublime": {
 			editTemplate:              "subl -- {{filename}}",
 			editAtLineTemplate:        "subl -- {{filename}}:{{line}}",
 			editAtLineAndWaitTemplate: "subl --wait -- {{filename}}:{{line}}",
-			openDirInEditorTemplate:   "subl -- {{dir}}",
 			editInTerminal:            false,
 		},
 		"bbedit": {
 			editTemplate:              "bbedit -- {{filename}}",
 			editAtLineTemplate:        "bbedit +{{line}} -- {{filename}}",
 			editAtLineAndWaitTemplate: "bbedit +{{line}} --wait -- {{filename}}",
-			openDirInEditorTemplate:   "bbedit -- {{dir}}",
 			editInTerminal:            false,
 		},
 		"xcode": {
 			editTemplate:              "xed -- {{filename}}",
 			editAtLineTemplate:        "xed --line {{line}} -- {{filename}}",
 			editAtLineAndWaitTemplate: "xed --line {{line}} --wait -- {{filename}}",
-			openDirInEditorTemplate:   "xed -- {{dir}}",
 			editInTerminal:            false,
 		},
 	}
@@ -122,7 +107,6 @@ func standardTerminalEditorPreset(editor string) *editPreset {
 		editTemplate:              editor + " -- {{filename}}",
 		editAtLineTemplate:        editor + " +{{line}} -- {{filename}}",
 		editAtLineAndWaitTemplate: editor + " +{{line}} -- {{filename}}",
-		openDirInEditorTemplate:   editor + " -- {{dir}}",
 		editInTerminal:            true,
 	}
 }
@@ -318,9 +318,6 @@ type OSConfig struct {
 	// Pointer to bool so that we can distinguish unset (nil) from false.
 	EditInTerminal *bool `yaml:"editInTerminal,omitempty"`

-	// For opening a directory in an editor
-	OpenDirInEditor string `yaml:"openDirInEditor,omitempty"`
-
 	// A built-in preset that sets all of the above settings. Supported presets
 	// are defined in the getPreset function in editor_presets.go.
 	EditPreset string `yaml:"editPreset,omitempty"`
@@ -10,10 +10,19 @@ func GetGitDirEnv() string {
 	return os.Getenv("GIT_DIR")
 }

+func GetGitWorkTreeEnv() string {
+	return os.Getenv("GIT_WORK_TREE")
+}
+
 func SetGitDirEnv(value string) {
 	os.Setenv("GIT_DIR", value)
 }

-func UnsetGitDirEnv() {
+func SetGitWorkTreeEnv(value string) {
+	os.Setenv("GIT_WORK_TREE", value)
+}
+
+func UnsetGitDirEnvs() {
 	_ = os.Unsetenv("GIT_DIR")
+	_ = os.Unsetenv("GIT_WORK_TREE")
 }
@@ -31,7 +31,7 @@ type CommitMessageViewModel struct {
 	// the full preserved message (combined summary and description)
 	preservedMessage string
 	// invoked when pressing enter in the commit message panel
-	onConfirm func(string, string) error
+	onConfirm func(string) error

 	// The message typed in before cycling through history
 	// We store this separately to 'preservedMessage' because 'preservedMessage'
@@ -88,22 +88,15 @@ func (self *CommitMessageContext) SetHistoryMessage(message string) {
 	self.viewModel.historyMessage = message
 }

-func (self *CommitMessageContext) OnConfirm(summary string, description string) error {
-	return self.viewModel.onConfirm(summary, description)
+func (self *CommitMessageContext) OnConfirm(message string) error {
+	return self.viewModel.onConfirm(message)
 }

-func (self *CommitMessageContext) SetPanelState(
-	index int,
-	summaryTitle string,
-	descriptionTitle string,
-	preserveMessage bool,
-	onConfirm func(string, string) error,
-) {
+func (self *CommitMessageContext) SetPanelState(index int, title string, preserveMessage bool, onConfirm func(string) error) {
 	self.viewModel.selectedindex = index
 	self.viewModel.preserveMessage = preserveMessage
 	self.viewModel.onConfirm = onConfirm
-	self.GetView().Title = summaryTitle
-	self.c.Views().CommitDescription.Title = descriptionTitle
+	self.GetView().Title = title
 }

 func (self *CommitMessageContext) RenderCommitLength() {
@@ -124,10 +124,10 @@ func (self *ContextTree) Flatten() []types.Context {
 		self.Status,
 		self.Snake,
 		self.Submodules,
-		self.Worktrees,
 		self.Files,
 		self.SubCommits,
 		self.Remotes,
+		self.Worktrees,
 		self.RemoteBranches,
 		self.Tags,
 		self.Branches,
@@ -1,11 +1,7 @@
 package context

 import (
-	"strings"
-
 	"github.com/jesseduffield/lazygit/pkg/utils"
-	"github.com/sahilm/fuzzy"
-	"github.com/samber/lo"
 	"github.com/sasha-s/go-deadlock"
 )

@@ -57,21 +53,6 @@ func (self *FilteredList[T]) UnfilteredLen() int {
 	return len(self.getList())
 }

-type fuzzySource[T any] struct {
-	list            []T
-	getFilterFields func(T) []string
-}
-
-var _ fuzzy.Source = &fuzzySource[string]{}
-
-func (self *fuzzySource[T]) String(i int) string {
-	return strings.Join(self.getFilterFields(self.list[i]), " ")
-}
-
-func (self *fuzzySource[T]) Len() int {
-	return len(self.list)
-}
-
 func (self *FilteredList[T]) applyFilter() {
 	self.mutex.Lock()
 	defer self.mutex.Unlock()
@@ -79,18 +60,22 @@ func (self *FilteredList[T]) applyFilter() {
 	if self.filter == "" {
 		self.filteredIndices = nil
 	} else {
-		source := &fuzzySource[T]{
-			list:            self.getList(),
-			getFilterFields: self.getFilterFields,
+		self.filteredIndices = []int{}
+		for i, item := range self.getList() {
+			for _, field := range self.getFilterFields(item) {
+				if self.match(field, self.filter) {
+					self.filteredIndices = append(self.filteredIndices, i)
+					break
+				}
+			}
 		}
-
-		matches := fuzzy.FindFrom(self.filter, source)
-		self.filteredIndices = lo.Map(matches, func(match fuzzy.Match, _ int) int {
-			return match.Index
-		})
 	}
 }

+func (self *FilteredList[T]) match(haystack string, needle string) bool {
+	return utils.CaseAwareContains(haystack, needle)
+}
+
 func (self *FilteredList[T]) UnfilteredIndex(index int) int {
 	self.mutex.Lock()
 	defer self.mutex.Unlock()
@@ -14,7 +14,7 @@ type ListContextTrait struct {
 	list              types.IList
 	getDisplayStrings func(startIdx int, length int) [][]string
 	// Alignment for each column. If nil, the default is left alignment
-	getColumnAlignments func() []utils.Alignment
+	columnAlignments []utils.Alignment
 	// Some contexts, like the commit context, will highlight the path from the selected commit
 	// to its parents, because it's ambiguous otherwise. For these, we need to refresh the viewport
 	// so that we show the highlighted path.
@@ -31,14 +31,7 @@ func (self *ListContextTrait) GetList() types.IList {
 }

 func (self *ListContextTrait) FocusLine() {
-	// Doing this at the end of the layout function because we need the view to be
-	// resized before we focus the line, otherwise if we're in accordion mode
-	// the view could be squashed and won't how to adjust the cursor/origin
-	self.c.AfterLayout(func() error {
-		self.GetViewTrait().FocusPoint(self.list.GetSelectedLineIdx())
-		return nil
-	})
-
+	self.GetViewTrait().FocusPoint(self.list.GetSelectedLineIdx())
 	self.setFooter()

 	if self.refreshViewportOnChange {
@@ -82,13 +75,9 @@ func (self *ListContextTrait) HandleFocusLost(opts types.OnFocusLostOpts) error
 // OnFocus assumes that the content of the context has already been rendered to the view. OnRender is the function which actually renders the content to the view
 func (self *ListContextTrait) HandleRender() error {
 	self.list.RefreshSelectedIdx()
-	var columnAlignments []utils.Alignment
-	if self.getColumnAlignments != nil {
-		columnAlignments = self.getColumnAlignments()
-	}
 	content := utils.RenderDisplayStrings(
 		self.getDisplayStrings(0, self.list.Len()),
-		columnAlignments,
+		self.columnAlignments,
 	)
 	self.GetViewTrait().SetContent(content)
 	self.c.Render()
@@ -35,10 +35,10 @@ func NewMenuContext(
 				Focusable:             true,
 				HasUncontrolledBounds: true,
 			})),
-			getDisplayStrings:   viewModel.GetDisplayStrings,
-			list:                viewModel,
-			c:                   c,
-			getColumnAlignments: func() []utils.Alignment { return viewModel.columnAlignment },
+			getDisplayStrings: viewModel.GetDisplayStrings,
+			list:              viewModel,
+			c:                 c,
+			columnAlignments:  []utils.Alignment{utils.AlignRight, utils.AlignLeft},
 		},
 	}
 }
@@ -54,9 +54,8 @@ func (self *MenuContext) GetSelectedItemId() string {
 }

 type MenuViewModel struct {
-	c               *ContextCommon
-	menuItems       []*types.MenuItem
-	columnAlignment []utils.Alignment
+	c         *ContextCommon
+	menuItems []*types.MenuItem
 	*FilteredListViewModel[*types.MenuItem]
 }

@@ -74,9 +73,8 @@ func NewMenuViewModel(c *ContextCommon) *MenuViewModel {
 	return self
 }

-func (self *MenuViewModel) SetMenuItems(items []*types.MenuItem, columnAlignment []utils.Alignment) {
+func (self *MenuViewModel) SetMenuItems(items []*types.MenuItem) {
 	self.menuItems = items
-	self.columnAlignment = columnAlignment
 }

 // TODO: move into presentation package
@@ -137,10 +135,6 @@ func (self *MenuContext) OnMenuPress(selectedItem *types.MenuItem) error {
 		return err
 	}

-	if selectedItem == nil {
-		return nil
-	}
-
 	if err := selectedItem.OnPress(); err != nil {
 		return err
 	}
@@ -17,14 +17,15 @@ func NewWorktreesContext(c *ContextCommon) *WorktreesContext {
 	viewModel := NewFilteredListViewModel(
 		func() []*models.Worktree { return c.Model().Worktrees },
 		func(Worktree *models.Worktree) []string {
-			return []string{Worktree.Name}
+			return []string{Worktree.Name()}
 		},
 	)

 	getDisplayStrings := func(startIdx int, length int) [][]string {
 		return presentation.GetWorktreeDisplayStrings(
-			c.Tr,
 			viewModel.GetFilteredList(),
+			c.Git().Worktree.IsCurrentWorktree,
+			c.Git().Worktree.IsWorktreePathMissing,
 		)
 	}

@@ -33,7 +34,7 @@ func NewWorktreesContext(c *ContextCommon) *WorktreesContext {
 		ListContextTrait: &ListContextTrait{
 			Context: NewSimpleContext(NewBaseContext(NewBaseContextOpts{
 				View:       c.Views().Worktrees,
-				WindowName: "files",
+				WindowName: "branches",
 				Key:        WORKTREES_CONTEXT_KEY,
 				Kind:       types.SIDE_CONTEXT,
 				Focusable:  true,
@@ -86,7 +86,7 @@ func (gui *Gui) resetHelpersAndControllers() {
 		Suggestions:     suggestionsHelper,
 		Files:           helpers.NewFilesHelper(helperCommon),
 		WorkingTree:     helpers.NewWorkingTreeHelper(helperCommon, refsHelper, commitsHelper, gpgHelper),
-		Tags:            helpers.NewTagsHelper(helperCommon, commitsHelper),
+		Tags:            helpers.NewTagsHelper(helperCommon),
 		GPG:             helpers.NewGpgHelper(helperCommon),
 		MergeAndRebase:  rebaseHelper,
 		MergeConflicts:  mergeConflictsHelper,
@@ -242,16 +242,18 @@ func (gui *Gui) resetHelpersAndControllers() {
 		controllers.AttachControllers(context, controllers.NewBasicCommitsController(common, context))
 	}

-	for _, context := range []controllers.CanViewWorktreeOptions{
-		gui.State.Contexts.LocalCommits,
-		gui.State.Contexts.ReflogCommits,
-		gui.State.Contexts.SubCommits,
-		gui.State.Contexts.Stash,
-		gui.State.Contexts.Branches,
-		gui.State.Contexts.RemoteBranches,
-		gui.State.Contexts.Tags,
-	} {
-		controllers.AttachControllers(context, controllers.NewWorktreeOptionsController(common, context))
+	if gui.c.Git().Version.SupportsWorktrees() {
+		for _, context := range []controllers.CanViewWorktreeOptions{
+			gui.State.Contexts.LocalCommits,
+			gui.State.Contexts.ReflogCommits,
+			gui.State.Contexts.SubCommits,
+			gui.State.Contexts.Stash,
+			gui.State.Contexts.Branches,
+			gui.State.Contexts.RemoteBranches,
+			gui.State.Contexts.Tags,
+		} {
+			controllers.AttachControllers(context, controllers.NewWorktreeOptionsController(common, context))
+		}
 	}

 	controllers.AttachControllers(gui.State.Contexts.ReflogCommits,
@@ -203,7 +203,7 @@ func (self *BranchesController) press(selectedBranch *models.Branch) error {
 	}

 	worktreeForRef, ok := self.worktreeForBranch(selectedBranch)
-	if ok && !worktreeForRef.IsCurrent {
+	if ok && !self.c.Git().Worktree.IsCurrentWorktree(worktreeForRef.Path) {
 		return self.promptToCheckoutWorktree(worktreeForRef)
 	}

@@ -216,15 +216,11 @@ func (self *BranchesController) worktreeForBranch(branch *models.Branch) (*model
 }

 func (self *BranchesController) promptToCheckoutWorktree(worktree *models.Worktree) error {
-	prompt := utils.ResolvePlaceholderString(self.c.Tr.AlreadyCheckedOutByWorktree, map[string]string{
-		"worktreeName": worktree.Name,
-	})
-
 	return self.c.Confirm(types.ConfirmOpts{
-		Title:  self.c.Tr.SwitchToWorktree,
-		Prompt: prompt,
+		Title:  "Switch to worktree",
+		Prompt: fmt.Sprintf("This branch is checked out by worktree %s. Do you want to switch to that worktree?", worktree.Name()),
 		HandleConfirm: func() error {
-			return self.c.Helpers().Worktree.Switch(worktree, context.LOCAL_BRANCHES_CONTEXT_KEY)
+			return self.c.Helpers().Worktree.Switch(worktree.Path, context.LOCAL_BRANCHES_CONTEXT_KEY)
 		},
 	})
 }
@@ -336,33 +332,28 @@ func (self *BranchesController) checkedOutByOtherWorktree(branch *models.Branch)
 func (self *BranchesController) promptWorktreeBranchDelete(selectedBranch *models.Branch) error {
 	worktree, ok := self.worktreeForBranch(selectedBranch)
 	if !ok {
-		self.c.Log.Error("promptWorktreeBranchDelete out of sync with list of worktrees")
+		self.c.Log.Error("CheckedOutByOtherWorktree out of sync with list of worktrees")
 		return nil
 	}

-	// TODO: i18n
-	title := utils.ResolvePlaceholderString(self.c.Tr.BranchCheckedOutByWorktree, map[string]string{
-		"worktreeName": worktree.Name,
-		"branchName":   selectedBranch.Name,
-	})
 	return self.c.Menu(types.CreateMenuOptions{
-		Title: title,
+		Title: fmt.Sprintf("Branch %s is checked out by worktree %s", selectedBranch.Name, worktree.Name()),
 		Items: []*types.MenuItem{
 			{
-				Label: self.c.Tr.SwitchToWorktree,
+				Label: "Switch to worktree",
 				OnPress: func() error {
-					return self.c.Helpers().Worktree.Switch(worktree, context.LOCAL_BRANCHES_CONTEXT_KEY)
+					return self.c.Helpers().Worktree.Switch(worktree.Path, context.LOCAL_BRANCHES_CONTEXT_KEY)
 				},
 			},
 			{
-				Label:   self.c.Tr.DetachWorktree,
-				Tooltip: self.c.Tr.DetachWorktreeTooltip,
+				Label:   "Detach worktree",
+				Tooltip: "This will run `git checkout --detach` on the worktree so that it stops hogging the branch, but the worktree's working tree will be left alone",
 				OnPress: func() error {
 					return self.c.Helpers().Worktree.Detach(worktree)
 				},
 			},
 			{
-				Label: self.c.Tr.RemoveWorktree,
+				Label: "Remove worktree",
 				OnPress: func() error {
 					return self.c.Helpers().Worktree.Remove(worktree, false)
 				},
@@ -435,23 +426,15 @@ func (self *BranchesController) fastForward(branch *models.Branch) error {
 	)

 	return self.c.WithLoaderPanel(message, func(task gocui.Task) error {
-		worktree, ok := self.worktreeForBranch(branch)
-		if ok {
+		if branch == self.c.Helpers().Refs.GetCheckedOutRef() {
 			self.c.LogAction(action)

-			worktreeGitDir := ""
-			// if it is the current worktree path, no need to specify the path
-			if !worktree.IsCurrent {
-				worktreeGitDir = worktree.GitDir
-			}
-
 			err := self.c.Git().Sync.Pull(
 				task,
 				git_commands.PullOptions{
 					RemoteName:      branch.UpstreamRemote,
 					BranchName:      branch.UpstreamBranch,
 					FastForwardOnly: true,
-					WorktreeGitDir:  worktreeGitDir,
 				},
 			)
 			if err != nil {
@@ -461,10 +444,7 @@ func (self *BranchesController) fastForward(branch *models.Branch) error {
 			return self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC})
 		} else {
 			self.c.LogAction(action)
-
-			err := self.c.Git().Sync.FastForward(
-				task, branch.Name, branch.UpstreamRemote, branch.UpstreamBranch,
-			)
+			err := self.c.Git().Sync.FastForward(task, branch.Name, branch.UpstreamRemote, branch.UpstreamBranch)
 			if err != nil {
 				_ = self.c.Error(err)
 			}
@@ -476,7 +456,7 @@ func (self *BranchesController) fastForward(branch *models.Branch) error {
 }

 func (self *BranchesController) createTag(branch *models.Branch) error {
-	return self.c.Helpers().Tags.OpenCreateTagPrompt(branch.FullRefName(), func() {})
+	return self.c.Helpers().Tags.CreateTagMenu(branch.FullRefName(), func() {})
 }

 func (self *BranchesController) createResetMenu(selectedBranch *models.Branch) error {
@@ -495,10 +475,7 @@ func (self *BranchesController) rename(branch *models.Branch) error {
 				}

 				// need to find where the branch is now so that we can re-select it. That means we need to refetch the branches synchronously and then find our branch
-				_ = self.c.Refresh(types.RefreshOptions{
-					Mode:  types.SYNC,
-					Scope: []types.RefreshableView{types.BRANCHES, types.WORKTREES},
-				})
+				_ = self.c.Refresh(types.RefreshOptions{Mode: types.SYNC, Scope: []types.RefreshableView{types.BRANCHES}})

 				// now that we've got our stuff again we need to find that branch and reselect it.
 				for i, newBranch := range self.c.Model().Branches {
@@ -5,7 +5,6 @@ import (

 	"github.com/jesseduffield/gocui"
 	"github.com/jesseduffield/lazygit/pkg/commands/types/enums"
-	"github.com/jesseduffield/lazygit/pkg/gui/controllers/helpers"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
 )

@@ -18,10 +17,6 @@ func (self *CustomPatchOptionsMenuAction) Call() error {
 		return self.c.ErrorMsg(self.c.Tr.NoPatchError)
 	}

-	if self.c.Git().Patch.PatchBuilder.IsEmpty() {
-		return self.c.ErrorMsg(self.c.Tr.EmptyPatchError)
-	}
-
 	menuItems := []*types.MenuItem{
 		{
 			Label:   self.c.Tr.ResetPatch,
@@ -187,26 +182,12 @@ func (self *CustomPatchOptionsMenuAction) handlePullPatchIntoNewCommit() error {
 		return err
 	}

-	commitIndex := self.getPatchCommitIndex()
-	return self.c.Helpers().Commits.OpenCommitMessagePanel(
-		&helpers.OpenCommitMessagePanelOpts{
-			// Pass a commit index of one less than the moved-from commit, so that
-			// you can press up arrow once to recall the original commit message:
-			CommitIndex:      commitIndex - 1,
-			InitialMessage:   "",
-			SummaryTitle:     self.c.Tr.CommitSummaryTitle,
-			DescriptionTitle: self.c.Tr.CommitDescriptionTitle,
-			PreserveMessage:  false,
-			OnConfirm: func(summary string, description string) error {
-				return self.c.WithWaitingStatus(self.c.Tr.RebasingStatus, func(gocui.Task) error {
-					_ = self.c.Helpers().Commits.PopCommitMessageContexts()
-					self.c.LogAction(self.c.Tr.Actions.MovePatchIntoNewCommit)
-					err := self.c.Git().Patch.PullPatchIntoNewCommit(self.c.Model().Commits, commitIndex, summary, description)
-					return self.c.Helpers().MergeAndRebase.CheckMergeOrRebase(err)
-				})
-			},
-		},
-	)
+	return self.c.WithWaitingStatus(self.c.Tr.RebasingStatus, func(gocui.Task) error {
+		commitIndex := self.getPatchCommitIndex()
+		self.c.LogAction(self.c.Tr.Actions.MovePatchIntoNewCommit)
+		err := self.c.Git().Patch.PullPatchIntoNewCommit(self.c.Model().Commits, commitIndex)
+		return self.c.Helpers().MergeAndRebase.CheckMergeOrRebase(err)
+	})
 }

 func (self *CustomPatchOptionsMenuAction) handleApplyPatch(reverse bool) error {
@@ -63,44 +63,33 @@ func (self *CommitsHelper) JoinCommitMessageAndDescription() string {
 }

 func (self *CommitsHelper) UpdateCommitPanelView(message string) {
+	// first try the passed in message, if not fallback to context -> view in that order
 	if message != "" {
 		self.SetMessageAndDescriptionInView(message)
 		return
 	}
-
-	if self.c.Contexts().CommitMessage.GetPreserveMessage() {
-		preservedMessage := self.c.Contexts().CommitMessage.GetPreservedMessage()
-		self.SetMessageAndDescriptionInView(preservedMessage)
-		return
+	message = self.c.Contexts().CommitMessage.GetPreservedMessage()
+	if message != "" {
+		self.SetMessageAndDescriptionInView(message)
+	} else {
+		self.SetMessageAndDescriptionInView(self.getCommitSummary())
 	}
-
-	self.SetMessageAndDescriptionInView("")
 }

 type OpenCommitMessagePanelOpts struct {
-	CommitIndex      int
-	SummaryTitle     string
-	DescriptionTitle string
-	PreserveMessage  bool
-	OnConfirm        func(summary string, description string) error
-	InitialMessage   string
+	CommitIndex     int
+	Title           string
+	PreserveMessage bool
+	OnConfirm       func(string) error
+	InitialMessage  string
 }

 func (self *CommitsHelper) OpenCommitMessagePanel(opts *OpenCommitMessagePanelOpts) error {
-	onConfirm := func(summary string, description string) error {
-		if err := self.CloseCommitMessagePanel(); err != nil {
-			return err
-		}
-
-		return opts.OnConfirm(summary, description)
-	}
-
 	self.c.Contexts().CommitMessage.SetPanelState(
 		opts.CommitIndex,
-		opts.SummaryTitle,
-		opts.DescriptionTitle,
+		opts.Title,
 		opts.PreserveMessage,
-		onConfirm,
+		opts.OnConfirm,
 	)

 	self.UpdateCommitPanelView(opts.InitialMessage)
@@ -113,16 +102,17 @@ func (self *CommitsHelper) OnCommitSuccess() {
 	if self.c.Contexts().CommitMessage.GetPreserveMessage() {
 		self.c.Contexts().CommitMessage.SetPreservedMessage("")
 	}
+	self.SetMessageAndDescriptionInView("")
 }

 func (self *CommitsHelper) HandleCommitConfirm() error {
-	summary, description := self.getCommitSummary(), self.getCommitDescription()
+	fullMessage := self.JoinCommitMessageAndDescription()

-	if summary == "" {
+	if fullMessage == "" {
 		return self.c.ErrorMsg(self.c.Tr.CommitWithoutMessageErr)
 	}

-	err := self.c.Contexts().CommitMessage.OnConfirm(summary, description)
+	err := self.c.Contexts().CommitMessage.OnConfirm(fullMessage)
 	if err != nil {
 		return err
 	}
@@ -302,12 +302,7 @@ func (self *ConfirmationHelper) resizeMenu() {
 	_, _ = self.c.GocuiGui().SetView(self.c.Views().Menu.Name(), x0, y0, x1, menuBottom, 0)

 	tooltipTop := menuBottom + 1
-	tooltip := ""
-	selectedItem := self.c.Contexts().Menu.GetSelected()
-	if selectedItem != nil {
-		tooltip = selectedItem.Tooltip
-	}
-	tooltipHeight := getMessageHeight(true, tooltip, panelWidth) + 2 // plus 2 for the frame
+	tooltipHeight := getMessageHeight(true, self.c.Contexts().Menu.GetSelected().Tooltip, panelWidth) + 2 // plus 2 for the frame
 	_, _ = self.c.GocuiGui().SetView(self.c.Views().Tooltip.Name(), x0, tooltipTop, x1, tooltipTop+tooltipHeight-1, 0)
 }

@@ -37,13 +37,6 @@ func (self *FilesHelper) EditFileAtLineAndWait(filename string, lineNumber int)
 	return self.callEditor(cmdStr, true)
 }

-func (self *FilesHelper) OpenDirInEditor(path string) error {
-	cmdStr := self.c.Git().File.GetOpenDirInEditorCmdStr(path)
-
-	// Not editing in terminal because surely that's not a thing.
-	return self.callEditor(cmdStr, false)
-}
-
 func (self *FilesHelper) callEditor(cmdStr string, editInTerminal bool) error {
 	if editInTerminal {
 		return self.c.RunSubprocessAndRefresh(
@@ -1,10 +1,8 @@
 package helpers

 import (
-	"fmt"
 	"strings"
 	"sync"
-	"time"

 	"github.com/jesseduffield/generics/set"
 	"github.com/jesseduffield/generics/slices"
@@ -54,11 +52,6 @@ func NewRefreshHelper(
 }

 func (self *RefreshHelper) Refresh(options types.RefreshOptions) error {
-	t := time.Now()
-	defer func() {
-		self.c.Log.Infof(fmt.Sprintf("Refresh took %s", time.Since(t)))
-	}()
-
 	if options.Scope == nil {
 		self.c.Log.Infof(
 			"refreshing all scopes in %s mode",
@@ -94,82 +87,63 @@ func (self *RefreshHelper) Refresh(options types.RefreshOptions) error {
 			scopeSet = set.NewFromSlice(options.Scope)
 		}

-		wg := sync.WaitGroup{}
-		refresh := func(name string, f func()) {
+		refresh := func(f func()) {
 			if options.Mode == types.ASYNC {
 				self.c.OnWorker(func(t gocui.Task) {
 					f()
 				})
 			} else {
-				wg.Add(1)
-				go utils.Safe(func() {
-					t := time.Now()
-					defer wg.Done()
-					f()
-					self.c.Log.Infof(fmt.Sprintf("refreshed %s in %s", name, time.Since(t)))
-				})
+				f()
 			}
 		}

 		if scopeSet.Includes(types.COMMITS) || scopeSet.Includes(types.BRANCHES) || scopeSet.Includes(types.REFLOG) || scopeSet.Includes(types.BISECT_INFO) {
-			// whenever we change commits, we should update branches because the upstream/downstream
-			// counts can change. Whenever we change branches we should also change commits
-			// e.g. in the case of switching branches.
-			refresh("commits and commit files", self.refreshCommitsAndCommitFiles)
-			refresh("reflog and branches", self.refreshReflogAndBranches)
+			refresh(self.refreshCommits)
 		} else if scopeSet.Includes(types.REBASE_COMMITS) {
 			// the above block handles rebase commits so we only need to call this one
 			// if we've asked specifically for rebase commits and not those other things
-			refresh("rebase commits", func() { _ = self.refreshRebaseCommits() })
+			refresh(func() { _ = self.refreshRebaseCommits() })
 		}

 		if scopeSet.Includes(types.SUB_COMMITS) {
-			refresh("sub commits", func() { _ = self.refreshSubCommitsWithLimit() })
+			refresh(func() { _ = self.refreshSubCommitsWithLimit() })
 		}

 		// reason we're not doing this if the COMMITS type is included is that if the COMMITS type _is_ included we will refresh the commit files context anyway
 		if scopeSet.Includes(types.COMMIT_FILES) && !scopeSet.Includes(types.COMMITS) {
-			refresh("commit files", func() { _ = self.refreshCommitFilesContext() })
+			refresh(func() { _ = self.refreshCommitFilesContext() })
 		}

-		fileWg := sync.WaitGroup{}
 		if scopeSet.Includes(types.FILES) || scopeSet.Includes(types.SUBMODULES) {
-			fileWg.Add(1)
-			refresh("files", func() {
-				_ = self.refreshFilesAndSubmodules()
-				fileWg.Done()
-			})
+			refresh(func() { _ = self.refreshFilesAndSubmodules() })
 		}

 		if scopeSet.Includes(types.STASH) {
-			refresh("stash", func() { _ = self.refreshStashEntries() })
+			refresh(func() { _ = self.refreshStashEntries() })
 		}

 		if scopeSet.Includes(types.TAGS) {
-			refresh("tags", func() { _ = self.refreshTags() })
+			refresh(func() { _ = self.refreshTags() })
 		}

 		if scopeSet.Includes(types.REMOTES) {
-			refresh("remotes", func() { _ = self.refreshRemotes() })
+			refresh(func() { _ = self.refreshRemotes() })
 		}

 		if scopeSet.Includes(types.WORKTREES) {
-			refresh("worktrees", func() { _ = self.refreshWorktrees() })
+			refresh(func() { _ = self.refreshWorktrees() })
 		}

 		if scopeSet.Includes(types.STAGING) {
-			refresh("staging", func() {
-				fileWg.Wait()
-				_ = self.stagingHelper.RefreshStagingPanel(types.OnFocusOpts{})
-			})
+			refresh(func() { _ = self.stagingHelper.RefreshStagingPanel(types.OnFocusOpts{}) })
 		}

 		if scopeSet.Includes(types.PATCH_BUILDING) {
-			refresh("patch building", func() { _ = self.patchBuildingHelper.RefreshPatchBuildingPanel(types.OnFocusOpts{}) })
+			refresh(func() { _ = self.patchBuildingHelper.RefreshPatchBuildingPanel(types.OnFocusOpts{}) })
 		}

 		if scopeSet.Includes(types.MERGE_CONFLICTS) || scopeSet.Includes(types.FILES) {
-			refresh("merge conflicts", func() { _ = self.mergeConflictsHelper.RefreshMergeState() })
+			refresh(func() { _ = self.mergeConflictsHelper.RefreshMergeState() })
 		}

 		self.refreshStatus()
@@ -177,8 +151,6 @@ func (self *RefreshHelper) Refresh(options types.RefreshOptions) error {
 		if options.Then != nil {
 			options.Then()
 		}
-
-		wg.Wait()
 	}

 	if options.Mode == types.BLOCK_UI {
@@ -247,29 +219,41 @@ func (self *RefreshHelper) refreshReflogCommitsConsideringStartup() {
 	}
 }

-func (self *RefreshHelper) refreshReflogAndBranches() {
-	self.refreshReflogCommitsConsideringStartup()
+// whenever we change commits, we should update branches because the upstream/downstream
+// counts can change. Whenever we change branches we should probably also change commits
+// e.g. in the case of switching branches.
+func (self *RefreshHelper) refreshCommits() {
+	wg := sync.WaitGroup{}
+	wg.Add(2)

-	self.refreshBranches()
-}
+	go utils.Safe(func() {
+		self.refreshReflogCommitsConsideringStartup()

-func (self *RefreshHelper) refreshCommitsAndCommitFiles() {
-	_ = self.refreshCommitsWithLimit()
-	ctx, ok := self.c.Contexts().CommitFiles.GetParentContext()
-	if ok && ctx.GetKey() == context.LOCAL_COMMITS_CONTEXT_KEY {
-		// This makes sense when we've e.g. just amended a commit, meaning we get a new commit SHA at the same position.
-		// However if we've just added a brand new commit, it pushes the list down by one and so we would end up
-		// showing the contents of a different commit than the one we initially entered.
-		// Ideally we would know when to refresh the commit files context and when not to,
-		// or perhaps we could just pop that context off the stack whenever cycling windows.
-		// For now the awkwardness remains.
-		commit := self.c.Contexts().LocalCommits.GetSelected()
-		if commit != nil {
-			self.c.Contexts().CommitFiles.SetRef(commit)
-			self.c.Contexts().CommitFiles.SetTitleRef(commit.RefName())
-			_ = self.refreshCommitFilesContext()
+		self.refreshBranches()
+		wg.Done()
+	})
+
+	go utils.Safe(func() {
+		_ = self.refreshCommitsWithLimit()
+		ctx, ok := self.c.Contexts().CommitFiles.GetParentContext()
+		if ok && ctx.GetKey() == context.LOCAL_COMMITS_CONTEXT_KEY {
+			// This makes sense when we've e.g. just amended a commit, meaning we get a new commit SHA at the same position.
+			// However if we've just added a brand new commit, it pushes the list down by one and so we would end up
+			// showing the contents of a different commit than the one we initially entered.
+			// Ideally we would know when to refresh the commit files context and when not to,
+			// or perhaps we could just pop that context off the stack whenever cycling windows.
+			// For now the awkwardness remains.
+			commit := self.c.Contexts().LocalCommits.GetSelected()
+			if commit != nil {
+				self.c.Contexts().CommitFiles.SetRef(commit)
+				self.c.Contexts().CommitFiles.SetTitleRef(commit.RefName())
+				_ = self.refreshCommitFilesContext()
+			}
 		}
-	}
+		wg.Done()
+	})
+
+	wg.Wait()
 }

 func (self *RefreshHelper) refreshCommitsWithLimit() error {
@@ -289,7 +273,6 @@ func (self *RefreshHelper) refreshCommitsWithLimit() error {
 		return err
 	}
 	self.c.Model().Commits = commits
-	self.RefreshAuthors(commits)
 	self.c.Model().WorkingTreeStateAtLastCommitRefresh = self.c.Git().Status.WorkingTreeState()

 	return self.c.PostRefreshUpdate(self.c.Contexts().LocalCommits)
@@ -311,26 +294,10 @@ func (self *RefreshHelper) refreshSubCommitsWithLimit() error {
 		return err
 	}
 	self.c.Model().SubCommits = commits
-	self.RefreshAuthors(commits)

 	return self.c.PostRefreshUpdate(self.c.Contexts().SubCommits)
 }

-func (self *RefreshHelper) RefreshAuthors(commits []*models.Commit) {
-	self.c.Mutexes().AuthorsMutex.Lock()
-	defer self.c.Mutexes().AuthorsMutex.Unlock()
-
-	authors := self.c.Model().Authors
-	for _, commit := range commits {
-		if _, ok := authors[commit.AuthorEmail]; !ok {
-			authors[commit.AuthorEmail] = &models.Author{
-				Email: commit.AuthorEmail,
-				Name:  commit.AuthorName,
-			}
-		}
-	}
-}
-
 func (self *RefreshHelper) refreshCommitFilesContext() error {
 	ref := self.c.Contexts().CommitFiles.GetRef()
 	to := ref.RefName()
@@ -598,21 +565,18 @@ func (self *RefreshHelper) refreshRemotes() error {
 }

 func (self *RefreshHelper) refreshWorktrees() error {
-	worktrees, err := self.c.Git().Loaders.Worktrees.GetWorktrees()
-	if err != nil {
-		self.c.Log.Error(err)
+	if !self.c.Git().Version.SupportsWorktrees() {
 		self.c.Model().Worktrees = []*models.Worktree{}
 		return nil
 	}

-	self.c.Model().Worktrees = worktrees
-
-	// need to refresh branches because the branches view shows worktrees against
-	// branches
-	if err := self.c.PostRefreshUpdate(self.c.Contexts().Branches); err != nil {
-		return err
+	worktrees, err := self.c.Git().Loaders.Worktrees.GetWorktrees()
+	if err != nil {
+		return self.c.Error(err)
 	}

+	self.c.Model().Worktrees = worktrees
+
 	return self.c.PostRefreshUpdate(self.c.Contexts().Worktrees)
 }

@@ -635,9 +599,12 @@ func (self *RefreshHelper) refreshStatus() {
 	}

 	workingTreeState := self.c.Git().Status.WorkingTreeState()
-	linkedWorktreeName := self.worktreeHelper.GetLinkedWorktreeName()
+	var linkedWorktreeName string
+	if self.c.Git().Version.SupportsWorktrees() {
+		linkedWorktreeName = self.worktreeHelper.GetLinkedWorktreeName()
+	}

-	repoName := self.c.Git().RepoPaths.RepoName()
+	repoName := self.worktreeHelper.GetCurrentRepoName()

 	status := presentation.FormatStatus(repoName, currentBranch, linkedWorktreeName, workingTreeState, self.c.Tr)

@@ -8,7 +8,6 @@ import (
 	"sync"

 	"github.com/jesseduffield/generics/slices"
-	"github.com/jesseduffield/gocui"
 	appTypes "github.com/jesseduffield/lazygit/pkg/app/types"
 	"github.com/jesseduffield/lazygit/pkg/commands"
 	"github.com/jesseduffield/lazygit/pkg/commands/models"
@@ -20,7 +19,7 @@ import (
 	"github.com/jesseduffield/lazygit/pkg/utils"
 )

-type onNewRepoFn func(startArgs appTypes.StartArgs, contextKey types.ContextKey) error
+type onNewRepoFn func(startArgs appTypes.StartArgs, reuseState bool, contextKey types.ContextKey) error

 // helps switch back and forth between repos
 type ReposHelper struct {
@@ -48,7 +47,7 @@ func (self *ReposHelper) EnterSubmodule(submodule *models.SubmoduleConfig) error
 	}
 	self.c.State().GetRepoPathStack().Push(wd)

-	return self.DispatchSwitchToRepo(submodule.Path, context.NO_CONTEXT)
+	return self.DispatchSwitchToRepo(submodule.Path, true, context.NO_CONTEXT)
 }

 func (self *ReposHelper) getCurrentBranch(path string) string {
@@ -131,7 +130,7 @@ func (self *ReposHelper) CreateRecentReposMenu() error {
 				// if we were in a submodule, we want to forget about that stack of repos
 				// so that hitting escape in the new repo does nothing
 				self.c.State().GetRepoPathStack().Clear()
-				return self.DispatchSwitchToRepo(path, context.NO_CONTEXT)
+				return self.DispatchSwitchToRepo(path, false, context.NO_CONTEXT)
 			},
 		}
 	})
@@ -139,48 +138,45 @@ func (self *ReposHelper) CreateRecentReposMenu() error {
 	return self.c.Menu(types.CreateMenuOptions{Title: self.c.Tr.RecentRepos, Items: menuItems})
 }

-func (self *ReposHelper) DispatchSwitchToRepo(path string, contextKey types.ContextKey) error {
-	return self.DispatchSwitchTo(path, self.c.Tr.ErrRepositoryMovedOrDeleted, contextKey)
+func (self *ReposHelper) DispatchSwitchToRepo(path string, reuse bool, contextKey types.ContextKey) error {
+	return self.DispatchSwitchTo(path, reuse, self.c.Tr.ErrRepositoryMovedOrDeleted, contextKey)
 }

-func (self *ReposHelper) DispatchSwitchTo(path string, errMsg string, contextKey types.ContextKey) error {
-	return self.c.WithWaitingStatus(self.c.Tr.Switching, func(gocui.Task) error {
-		env.UnsetGitDirEnv()
-		originalPath, err := os.Getwd()
-		if err != nil {
-			return nil
+func (self *ReposHelper) DispatchSwitchTo(path string, reuse bool, errMsg string, contextKey types.ContextKey) error {
+	env.UnsetGitDirEnvs()
+	originalPath, err := os.Getwd()
+	if err != nil {
+		return nil
+	}
+
+	self.c.LogCommand(fmt.Sprintf("Changing directory to %s", path), false)
+
+	if err := os.Chdir(path); err != nil {
+		if os.IsNotExist(err) {
+			return self.c.ErrorMsg(errMsg)
 		}
+		return err
+	}

-		msg := utils.ResolvePlaceholderString(self.c.Tr.ChangingDirectoryTo, map[string]string{"path": path})
-		self.c.LogCommand(msg, false)
-
-		if err := os.Chdir(path); err != nil {
-			if os.IsNotExist(err) {
-				return self.c.ErrorMsg(errMsg)
-			}
+	if err := commands.VerifyInGitRepo(self.c.OS()); err != nil {
+		if err := os.Chdir(originalPath); err != nil {
 			return err
 		}

-		if err := commands.VerifyInGitRepo(self.c.OS()); err != nil {
-			if err := os.Chdir(originalPath); err != nil {
-				return err
-			}
+		return err
+	}

-			return err
-		}
+	if err := self.recordDirectoryHelper.RecordCurrentDirectory(); err != nil {
+		return err
+	}

-		if err := self.recordDirectoryHelper.RecordCurrentDirectory(); err != nil {
-			return err
-		}
+	// these two mutexes are used by our background goroutines (triggered via `self.goEvery`. We don't want to
+	// switch to a repo while one of these goroutines is in the process of updating something
+	self.c.Mutexes().SyncMutex.Lock()
+	defer self.c.Mutexes().SyncMutex.Unlock()

-		// these two mutexes are used by our background goroutines (triggered via `self.goEvery`. We don't want to
-		// switch to a repo while one of these goroutines is in the process of updating something
-		self.c.Mutexes().SyncMutex.Lock()
-		defer self.c.Mutexes().SyncMutex.Unlock()
+	self.c.Mutexes().RefreshingFilesMutex.Lock()
+	defer self.c.Mutexes().RefreshingFilesMutex.Unlock()

-		self.c.Mutexes().RefreshingFilesMutex.Lock()
-		defer self.c.Mutexes().RefreshingFilesMutex.Unlock()
-
-		return self.onNewRepo(appTypes.StartArgs{}, contextKey)
-	})
+	return self.onNewRepo(appTypes.StartArgs{}, reuse, contextKey)
 }
@@ -176,11 +176,9 @@ func (self *SuggestionsHelper) GetRefsSuggestionsFunc() func(string) []*types.Su
 }

 func (self *SuggestionsHelper) GetAuthorsSuggestionsFunc() func(string) []*types.Suggestion {
-	authors := lo.Map(lo.Values(self.c.Model().Authors), func(author *models.Author, _ int) string {
-		return author.Combined()
-	})
-
-	slices.Sort(authors)
+	authors := lo.Uniq(slices.Map(self.c.Model().Commits, func(commit *models.Commit) string {
+		return fmt.Sprintf("%s <%s>", commit.AuthorName, commit.AuthorEmail)
+	}))

 	return FuzzySearchFunc(authors)
 }
@@ -1,54 +1,77 @@
 package helpers

 import (
-	"github.com/jesseduffield/gocui"
-	"github.com/jesseduffield/lazygit/pkg/gui/context"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
 )

+// Helper structs are for defining functionality that could be used by multiple contexts.
+// For example, here we have a CreateTagMenu which is applicable to both the tags context
+// and the commits context.
+
 type TagsHelper struct {
-	c             *HelperCommon
-	commitsHelper *CommitsHelper
+	c *HelperCommon
 }

-func NewTagsHelper(c *HelperCommon, commitsHelper *CommitsHelper) *TagsHelper {
+func NewTagsHelper(c *HelperCommon) *TagsHelper {
 	return &TagsHelper{
-		c:             c,
-		commitsHelper: commitsHelper,
+		c: c,
 	}
 }

-func (self *TagsHelper) OpenCreateTagPrompt(ref string, onCreate func()) error {
-	onConfirm := func(tagName string, description string) error {
-		return self.c.WithWaitingStatus(self.c.Tr.CreatingTag, func(gocui.Task) error {
-			if description != "" {
-				self.c.LogAction(self.c.Tr.Actions.CreateAnnotatedTag)
-				if err := self.c.Git().Tag.CreateAnnotated(tagName, ref, description); err != nil {
-					return self.c.Error(err)
-				}
-			} else {
-				self.c.LogAction(self.c.Tr.Actions.CreateLightweightTag)
-				if err := self.c.Git().Tag.CreateLightweight(tagName, ref); err != nil {
-					return self.c.Error(err)
-				}
-			}
-
-			self.commitsHelper.OnCommitSuccess()
-
-			return self.c.Refresh(types.RefreshOptions{
-				Mode: types.ASYNC, Scope: []types.RefreshableView{types.COMMITS, types.TAGS},
-			})
-		})
-	}
-
-	return self.commitsHelper.OpenCommitMessagePanel(
-		&OpenCommitMessagePanelOpts{
-			CommitIndex:      context.NoCommitIndex,
-			InitialMessage:   "",
-			SummaryTitle:     self.c.Tr.TagNameTitle,
-			DescriptionTitle: self.c.Tr.TagMessageTitle,
-			PreserveMessage:  false,
-			OnConfirm:        onConfirm,
+func (self *TagsHelper) CreateTagMenu(ref string, onCreate func()) error {
+	return self.c.Menu(types.CreateMenuOptions{
+		Title: self.c.Tr.TagMenuTitle,
+		Items: []*types.MenuItem{
+			{
+				Label: self.c.Tr.LightweightTag,
+				OnPress: func() error {
+					return self.handleCreateLightweightTag(ref, onCreate)
+				},
+			},
+			{
+				Label: self.c.Tr.AnnotatedTag,
+				OnPress: func() error {
+					return self.handleCreateAnnotatedTag(ref, onCreate)
+				},
+			},
 		},
-	)
+	})
+}
+
+func (self *TagsHelper) afterTagCreate(onCreate func()) error {
+	onCreate()
+	return self.c.Refresh(types.RefreshOptions{
+		Mode: types.ASYNC, Scope: []types.RefreshableView{types.COMMITS, types.TAGS},
+	})
+}
+
+func (self *TagsHelper) handleCreateAnnotatedTag(ref string, onCreate func()) error {
+	return self.c.Prompt(types.PromptOpts{
+		Title: self.c.Tr.TagNameTitle,
+		HandleConfirm: func(tagName string) error {
+			return self.c.Prompt(types.PromptOpts{
+				Title: self.c.Tr.TagMessageTitle,
+				HandleConfirm: func(msg string) error {
+					self.c.LogAction(self.c.Tr.Actions.CreateAnnotatedTag)
+					if err := self.c.Git().Tag.CreateAnnotated(tagName, ref, msg); err != nil {
+						return self.c.Error(err)
+					}
+					return self.afterTagCreate(onCreate)
+				},
+			})
+		},
+	})
+}
+
+func (self *TagsHelper) handleCreateLightweightTag(ref string, onCreate func()) error {
+	return self.c.Prompt(types.PromptOpts{
+		Title: self.c.Tr.TagNameTitle,
+		HandleConfirm: func(tagName string) error {
+			self.c.LogAction(self.c.Tr.Actions.CreateLightweightTag)
+			if err := self.c.Git().Tag.CreateLightweight(tagName, ref); err != nil {
+				return self.c.Error(err)
+			}
+			return self.afterTagCreate(onCreate)
+		},
+	})
 }
@@ -8,6 +8,7 @@ import (
 	"github.com/jesseduffield/lazygit/pkg/config"
 	"github.com/jesseduffield/lazygit/pkg/gui/context"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
+	"github.com/jesseduffield/lazygit/pkg/utils"
 )

 type IWorkingTreeHelper interface {
@@ -98,19 +99,19 @@ func (self *WorkingTreeHelper) HandleCommitPressWithMessage(initialMessage strin

 	return self.commitsHelper.OpenCommitMessagePanel(
 		&OpenCommitMessagePanelOpts{
-			CommitIndex:      context.NoCommitIndex,
-			InitialMessage:   initialMessage,
-			SummaryTitle:     self.c.Tr.CommitSummaryTitle,
-			DescriptionTitle: self.c.Tr.CommitDescriptionTitle,
-			PreserveMessage:  true,
-			OnConfirm:        self.handleCommit,
+			CommitIndex:     context.NoCommitIndex,
+			InitialMessage:  initialMessage,
+			Title:           self.c.Tr.CommitSummary,
+			PreserveMessage: true,
+			OnConfirm:       self.handleCommit,
 		},
 	)
 }

-func (self *WorkingTreeHelper) handleCommit(summary string, description string) error {
-	cmdObj := self.c.Git().Commit.CommitCmdObj(summary, description)
+func (self *WorkingTreeHelper) handleCommit(message string) error {
+	cmdObj := self.c.Git().Commit.CommitCmdObj(message)
 	self.c.LogAction(self.c.Tr.Actions.Commit)
+	_ = self.commitsHelper.PopCommitMessageContexts()
 	return self.gpgHelper.WithGpgHandling(cmdObj, self.c.Tr.CommittingStatus, func() error {
 		self.commitsHelper.OnCommitSuccess()
 		return nil
@@ -202,7 +203,7 @@ func (self *WorkingTreeHelper) prepareFilesForCommit() error {
 }

 func (self *WorkingTreeHelper) commitPrefixConfigForRepo() *config.CommitPrefixConfig {
-	cfg, ok := self.c.UserConfig.Git.CommitPrefixes[self.c.Git().RepoPaths.RepoName()]
+	cfg, ok := self.c.UserConfig.Git.CommitPrefixes[utils.GetCurrentRepoName()]
 	if !ok {
 		return nil
 	}
@@ -1,6 +1,11 @@
 package helpers

 import (
+	"errors"
+	"io/fs"
+	"log"
+	"os"
+	"path/filepath"
 	"strings"

 	"github.com/jesseduffield/gocui"
@@ -34,8 +39,8 @@ func NewWorktreeHelper(c *HelperCommon, reposHelper *ReposHelper, refsHelper *Re

 func (self *WorktreeHelper) GetMainWorktreeName() string {
 	for _, worktree := range self.c.Model().Worktrees {
-		if worktree.IsMain {
-			return worktree.Name
+		if worktree.Main() {
+			return worktree.Name()
 		}
 	}

@@ -51,11 +56,32 @@ func (self *WorktreeHelper) GetLinkedWorktreeName() string {

 	// worktrees always have the current worktree on top
 	currentWorktree := worktrees[0]
-	if currentWorktree.IsMain {
+	if currentWorktree.Main() {
 		return ""
 	}

-	return currentWorktree.Name
+	return currentWorktree.Name()
+}
+
+func (self *WorktreeHelper) IsCurrentWorktree(w *models.Worktree) bool {
+	pwd, err := os.Getwd()
+	if err != nil {
+		self.c.Log.Errorf("failed to obtain current working directory: %w", err)
+		return false
+	}
+
+	return pwd == w.Path
+}
+
+func (self *WorktreeHelper) IsWorktreePathMissing(w *models.Worktree) bool {
+	if _, err := os.Stat(w.Path); err != nil {
+		if errors.Is(err, fs.ErrNotExist) {
+			return true
+		}
+		self.c.Log.Errorf("failed to check if worktree path `%s` exists: %w", w.Path, err)
+		return false
+	}
+	return false
 }

 func (self *WorktreeHelper) NewWorktree() error {
@@ -70,7 +96,7 @@ func (self *WorktreeHelper) NewWorktree() error {
 			HandleConfirm: func(base string) error {
 				// we assume that the base can be checked out
 				canCheckoutBase := true
-				return self.NewWorktreeCheckout(base, canCheckoutBase, detached, context.WORKTREES_CONTEXT_KEY)
+				return self.NewWorktreeCheckout(base, canCheckoutBase, detached)
 			},
 		})
 	}
@@ -96,7 +122,7 @@ func (self *WorktreeHelper) NewWorktree() error {
 	})
 }

-func (self *WorktreeHelper) NewWorktreeCheckout(base string, canCheckoutBase bool, detached bool, contextKey types.ContextKey) error {
+func (self *WorktreeHelper) NewWorktreeCheckout(base string, canCheckoutBase bool, detached bool) error {
 	opts := git_commands.NewWorktreeOpts{
 		Base:   base,
 		Detach: detached,
@@ -108,8 +134,7 @@ func (self *WorktreeHelper) NewWorktreeCheckout(base string, canCheckoutBase boo
 			if err := self.c.Git().Worktree.New(opts); err != nil {
 				return err
 			}
-
-			return self.reposHelper.DispatchSwitchTo(opts.Path, self.c.Tr.ErrWorktreeMovedOrRemoved, contextKey)
+			return self.Switch(opts.Path, context.LOCAL_BRANCHES_CONTEXT_KEY)
 		})
 	}

@@ -152,14 +177,14 @@ func (self *WorktreeHelper) NewWorktreeCheckout(base string, canCheckoutBase boo
 	})
 }

-func (self *WorktreeHelper) Switch(worktree *models.Worktree, contextKey types.ContextKey) error {
-	if worktree.IsCurrent {
+func (self *WorktreeHelper) Switch(path string, contextKey types.ContextKey) error {
+	if self.c.Git().Worktree.IsCurrentWorktree(path) {
 		return self.c.ErrorMsg(self.c.Tr.AlreadyInWorktree)
 	}

 	self.c.LogAction(self.c.Tr.SwitchToWorktree)

-	return self.reposHelper.DispatchSwitchTo(worktree.Path, self.c.Tr.ErrWorktreeMovedOrRemoved, contextKey)
+	return self.reposHelper.DispatchSwitchTo(path, true, self.c.Tr.ErrWorktreeMovedOrRemoved, contextKey)
 }

 func (self *WorktreeHelper) Remove(worktree *models.Worktree, force bool) error {
@@ -173,7 +198,7 @@ func (self *WorktreeHelper) Remove(worktree *models.Worktree, force bool) error
 	message := utils.ResolvePlaceholderString(
 		templateStr,
 		map[string]string{
-			"worktreeName": worktree.Name,
+			"worktreeName": worktree.Name(),
 		},
 	)

@@ -228,15 +253,50 @@ func (self *WorktreeHelper) ViewBranchWorktreeOptions(branchName string, canChec
 			{
 				LabelColumns: []string{utils.ResolvePlaceholderString(self.c.Tr.CreateWorktreeFrom, placeholders)},
 				OnPress: func() error {
-					return self.NewWorktreeCheckout(branchName, canCheckoutBase, false, context.LOCAL_BRANCHES_CONTEXT_KEY)
+					return self.NewWorktreeCheckout(branchName, canCheckoutBase, false)
 				},
 			},
 			{
 				LabelColumns: []string{utils.ResolvePlaceholderString(self.c.Tr.CreateWorktreeFromDetached, placeholders)},
 				OnPress: func() error {
-					return self.NewWorktreeCheckout(branchName, canCheckoutBase, true, context.LOCAL_BRANCHES_CONTEXT_KEY)
+					return self.NewWorktreeCheckout(branchName, canCheckoutBase, true)
 				},
 			},
 		},
 	})
 }
+
+func (self *WorktreeHelper) GetCurrentRepoName() string {
+	pwd, err := os.Getwd()
+	if err != nil {
+		log.Fatalln(err.Error())
+	}
+
+	// check if .git is a file or a directory
+	gitPath := filepath.Join(pwd, ".git")
+	gitFileInfo, err := os.Stat(gitPath)
+	if err != nil {
+		log.Fatalln(err.Error())
+	}
+
+	// must be a worktree or bare repo
+	if !gitFileInfo.IsDir() {
+		worktreeGitPath, ok := git_commands.WorktreeGitPath(pwd)
+		if !ok {
+			return basePath()
+		}
+
+		// now we just jump up three directories to get the repo name
+		return filepath.Base(filepath.Dir(filepath.Dir(filepath.Dir(worktreeGitPath))))
+	}
+
+	return basePath()
+}
+
+func basePath() string {
+	pwd, err := os.Getwd()
+	if err != nil {
+		log.Fatalln(err.Error())
+	}
+	return filepath.Base(pwd)
+}
@@ -267,22 +267,22 @@ func (self *LocalCommitsController) reword(commit *models.Commit) error {

 	return self.c.Helpers().Commits.OpenCommitMessagePanel(
 		&helpers.OpenCommitMessagePanelOpts{
-			CommitIndex:      self.context().GetSelectedLineIdx(),
-			InitialMessage:   commitMessage,
-			SummaryTitle:     self.c.Tr.Actions.RewordCommit,
-			DescriptionTitle: self.c.Tr.CommitDescriptionTitle,
-			PreserveMessage:  false,
-			OnConfirm:        self.handleReword,
+			CommitIndex:     self.context().GetSelectedLineIdx(),
+			InitialMessage:  commitMessage,
+			Title:           self.c.Tr.Actions.RewordCommit,
+			PreserveMessage: false,
+			OnConfirm:       self.handleReword,
 		},
 	)
 }

-func (self *LocalCommitsController) handleReword(summary string, description string) error {
-	err := self.c.Git().Rebase.RewordCommit(self.c.Model().Commits, self.c.Contexts().LocalCommits.GetSelectedLineIdx(), summary, description)
+func (self *LocalCommitsController) handleReword(message string) error {
+	err := self.c.Git().Rebase.RewordCommit(self.c.Model().Commits, self.c.Contexts().LocalCommits.GetSelectedLineIdx(), message)
 	if err != nil {
 		return self.c.Error(err)
 	}
 	self.c.Helpers().Commits.OnCommitSuccess()
+	_ = self.c.Helpers().Commits.PopCommitMessageContexts()
 	return self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC})
 }

@@ -682,7 +682,7 @@ func (self *LocalCommitsController) squashAllAboveFixupCommits(commit *models.Co
 }

 func (self *LocalCommitsController) createTag(commit *models.Commit) error {
-	return self.c.Helpers().Tags.OpenCreateTagPrompt(commit.Sha, func() {})
+	return self.c.Helpers().Tags.CreateTagMenu(commit.Sha, func() {})
 }

 func (self *LocalCommitsController) openSearch() error {
@@ -53,9 +53,7 @@ func (self *MenuController) GetOnClick() func() error {
 func (self *MenuController) GetOnFocus() func(types.OnFocusOpts) error {
 	return func(types.OnFocusOpts) error {
 		selectedMenuItem := self.context().GetSelected()
-		if selectedMenuItem != nil {
-			self.c.Views().Tooltip.SetContent(selectedMenuItem.Tooltip)
-		}
+		self.c.Views().Tooltip.SetContent(selectedMenuItem.Tooltip)
 		return nil
 	}
 }
@@ -4,7 +4,6 @@ import (
 	"github.com/jesseduffield/generics/slices"
 	"github.com/jesseduffield/lazygit/pkg/gui/keybindings"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
-	"github.com/jesseduffield/lazygit/pkg/utils"
 	"github.com/samber/lo"
 )

@@ -38,10 +37,9 @@ func (self *OptionsMenuAction) Call() error {
 	})

 	return self.c.Menu(types.CreateMenuOptions{
-		Title:           self.c.Tr.Keybindings,
-		Items:           menuItems,
-		HideCancel:      true,
-		ColumnAlignment: []utils.Alignment{utils.AlignRight, utils.AlignLeft},
+		Title:      self.c.Tr.Keybindings,
+		Items:      menuItems,
+		HideCancel: true,
 	})
 }

@@ -78,7 +78,7 @@ func (self *QuitActions) Escape() error {

 	repoPathStack := self.c.State().GetRepoPathStack()
 	if !repoPathStack.IsEmpty() {
-		return self.c.Helpers().Repos.DispatchSwitchToRepo(repoPathStack.Pop(), context.NO_CONTEXT)
+		return self.c.Helpers().Repos.DispatchSwitchToRepo(repoPathStack.Pop(), true, context.NO_CONTEXT)
 	}

 	if self.c.UserConfig.QuitOnTopLevelReturn {
@@ -11,6 +11,7 @@ import (
 	"github.com/jesseduffield/lazygit/pkg/gui/presentation"
 	"github.com/jesseduffield/lazygit/pkg/gui/style"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
+	"github.com/jesseduffield/lazygit/pkg/utils"
 )

 type StatusController struct {
@@ -107,7 +108,7 @@ func (self *StatusController) onClick() error {

 	cx, _ := self.c.Views().Status.Cursor()
 	upstreamStatus := presentation.BranchStatus(currentBranch, self.c.Tr)
-	repoName := self.c.Git().RepoPaths.RepoName()
+	repoName := utils.GetCurrentRepoName()
 	workingTreeState := self.c.Git().Status.WorkingTreeState()
 	switch workingTreeState {
 	case enums.REBASE_MODE_REBASING, enums.REBASE_MODE_MERGING:
@@ -35,11 +35,6 @@ func (self *SubmodulesController) GetKeybindings(opts types.KeybindingsOpts) []*
 			Handler:     self.checkSelected(self.enter),
 			Description: self.c.Tr.EnterSubmodule,
 		},
-		{
-			Key:         opts.GetKey(opts.Config.Universal.Select),
-			Handler:     self.checkSelected(self.enter),
-			Description: self.c.Tr.EnterSubmodule,
-		},
 		{
 			Key:         opts.GetKey(opts.Config.Universal.Remove),
 			Handler:     self.checkSelected(self.remove),
@@ -70,7 +70,6 @@ func (self *SwitchToSubCommitsController) viewCommits() error {
 	}

 	self.setSubCommits(commits)
-	self.c.Helpers().Refresh.RefreshAuthors(commits)

 	subCommitsContext := self.c.Contexts().SubCommits
 	subCommitsContext.SetSelectedLineIdx(0)
@@ -141,7 +141,7 @@ func (self *TagsController) createResetMenu(tag *models.Tag) error {

 func (self *TagsController) create() error {
 	// leaving commit SHA blank so that we're just creating the tag for the current commit
-	return self.c.Helpers().Tags.OpenCreateTagPrompt("", func() { self.context().SetSelectedLineIdx(0) })
+	return self.c.Helpers().Tags.CreateTagMenu("", func() { self.context().SetSelectedLineIdx(0) })
 }

 func (self *TagsController) withSelectedTag(f func(tag *models.Tag) error) func() error {
@@ -29,31 +29,26 @@ func NewWorktreesController(

 func (self *WorktreesController) GetKeybindings(opts types.KeybindingsOpts) []*types.Binding {
 	bindings := []*types.Binding{
-		{
-			Key:         opts.GetKey(opts.Config.Universal.New),
-			Handler:     self.add,
-			Description: self.c.Tr.CreateWorktree,
-		},
 		{
 			Key:         opts.GetKey(opts.Config.Universal.Select),
 			Handler:     self.checkSelected(self.enter),
 			Description: self.c.Tr.SwitchToWorktree,
 		},
 		{
-			Key:         opts.GetKey(opts.Config.Universal.Confirm),
-			Handler:     self.checkSelected(self.enter),
-			Description: self.c.Tr.SwitchToWorktree,
+			Key:         opts.GetKey(opts.Config.Universal.Remove),
+			Handler:     self.checkSelected(self.remove),
+			Description: self.c.Tr.RemoveWorktree,
+		},
+		{
+			Key:         opts.GetKey(opts.Config.Universal.New),
+			Handler:     self.add,
+			Description: self.c.Tr.CreateWorktree,
 		},
 		{
 			Key:         opts.GetKey(opts.Config.Universal.OpenFile),
 			Handler:     self.checkSelected(self.open),
 			Description: self.c.Tr.OpenInEditor,
 		},
-		{
-			Key:         opts.GetKey(opts.Config.Universal.Remove),
-			Handler:     self.checkSelected(self.remove),
-			Description: self.c.Tr.RemoveWorktree,
-		},
 	}

 	return bindings
@@ -67,18 +62,18 @@ func (self *WorktreesController) GetOnRenderToMain() func() error {
 			task = types.NewRenderStringTask(self.c.Tr.NoWorktreesThisRepo)
 		} else {
 			main := ""
-			if worktree.IsMain {
+			if worktree.Main() {
 				main = style.FgDefault.Sprintf(" %s", self.c.Tr.MainWorktree)
 			}

 			missing := ""
-			if worktree.IsPathMissing {
+			if self.c.Git().Worktree.IsWorktreePathMissing(worktree.Path) {
 				missing = style.FgRed.Sprintf(" %s", self.c.Tr.MissingWorktree)
 			}

 			var builder strings.Builder
 			w := tabwriter.NewWriter(&builder, 0, 0, 2, ' ', 0)
-			_, _ = fmt.Fprintf(w, "%s:\t%s%s\n", self.c.Tr.Name, style.FgGreen.Sprint(worktree.Name), main)
+			_, _ = fmt.Fprintf(w, "%s:\t%s%s\n", self.c.Tr.Name, style.FgGreen.Sprint(worktree.Name()), main)
 			_, _ = fmt.Fprintf(w, "%s:\t%s\n", self.c.Tr.Branch, style.FgYellow.Sprint(worktree.Branch))
 			_, _ = fmt.Fprintf(w, "%s:\t%s%s\n", self.c.Tr.Path, style.FgCyan.Sprint(worktree.Path), missing)
 			_ = w.Flush()
@@ -101,11 +96,11 @@ func (self *WorktreesController) add() error {
 }

 func (self *WorktreesController) remove(worktree *models.Worktree) error {
-	if worktree.IsMain {
+	if worktree.Main() {
 		return self.c.ErrorMsg(self.c.Tr.CantDeleteMainWorktree)
 	}

-	if worktree.IsCurrent {
+	if self.c.Git().Worktree.IsCurrentWorktree(worktree.Path) {
 		return self.c.ErrorMsg(self.c.Tr.CantDeleteCurrentWorktree)
 	}

@@ -117,11 +112,11 @@ func (self *WorktreesController) GetOnClick() func() error {
 }

 func (self *WorktreesController) enter(worktree *models.Worktree) error {
-	return self.c.Helpers().Worktree.Switch(worktree, context.WORKTREES_CONTEXT_KEY)
+	return self.c.Helpers().Worktree.Switch(worktree.Path, context.WORKTREES_CONTEXT_KEY)
 }

 func (self *WorktreesController) open(worktree *models.Worktree) error {
-	return self.c.Helpers().Files.OpenDirInEditor(worktree.Path)
+	return self.c.Helpers().Files.OpenFile(worktree.Path)
 }

 func (self *WorktreesController) checkSelected(callback func(worktree *models.Worktree) error) func() error {
@@ -47,7 +47,8 @@ func (gui *Gui) handleEditorKeypress(textArea *gocui.TextArea, key gocui.Key, ch
 	case key == gocui.KeyCtrlY:
 		textArea.Yank()

-	case unicode.IsPrint(ch):
+		// TODO: see if we need all three of these conditions: maybe the final one is sufficient
+	case ch != 0 && mod == 0 && unicode.IsPrint(ch):
 		textArea.TypeRune(ch)
 	default:
 		return false
@@ -64,8 +64,7 @@ type Gui struct {
 	CustomCommandsClient *custom_commands.Client

 	// this is a mapping of repos to gui states, so that we can restore the original
-	// gui state when returning from a subrepo.
-	// In repos with multiple worktrees, we store a separate repo state per worktree.
+	// gui state when returning from a subrepo
 	RepoStateMap         map[Repo]*GuiRepoState
 	Config               config.AppConfigurer
 	Updater              *updates.Updater
@@ -133,8 +132,6 @@ type Gui struct {
 	helpers *helpers.Helpers

 	integrationTest integrationTypes.IntegrationTest
-
-	afterLayoutFuncs chan func() error
 }

 type StateAccessor struct {
@@ -277,7 +274,7 @@ func (self *GuiRepoState) GetSplitMainPanel() bool {
 	return self.SplitMainPanel
 }

-func (gui *Gui) onNewRepo(startArgs appTypes.StartArgs, contextKey types.ContextKey) error {
+func (gui *Gui) onNewRepo(startArgs appTypes.StartArgs, reuseState bool, contextKey types.ContextKey) error {
 	var err error
 	gui.git, err = commands.NewGitCommand(
 		gui.Common,
@@ -290,7 +287,7 @@ func (gui *Gui) onNewRepo(startArgs appTypes.StartArgs, contextKey types.Context
 		return err
 	}

-	contextToPush := gui.resetState(startArgs)
+	contextToPush := gui.resetState(startArgs, reuseState)

 	gui.resetHelpersAndControllers()

@@ -325,23 +322,26 @@ func (gui *Gui) onNewRepo(startArgs appTypes.StartArgs, contextKey types.Context
 // it gets a bit confusing to land back in the status panel when visiting a repo
 // you've already switched from. There's no doubt some easy way to make the UX
 // optimal for all cases but I'm too lazy to think about what that is right now
-func (gui *Gui) resetState(startArgs appTypes.StartArgs) types.Context {
-	worktreePath := gui.git.RepoPaths.WorktreePath()
+func (gui *Gui) resetState(startArgs appTypes.StartArgs, reuseState bool) types.Context {
+	currentDir, err := os.Getwd()

-	if state := gui.RepoStateMap[Repo(worktreePath)]; state != nil {
-		gui.State = state
-		gui.State.ViewsSetup = false
+	if reuseState {
+		if err == nil {
+			if state := gui.RepoStateMap[Repo(currentDir)]; state != nil {
+				gui.State = state
+				gui.State.ViewsSetup = false

-		contextTree := gui.State.Contexts
-		gui.State.WindowViewNameMap = initialWindowViewNameMap(contextTree)
+				// setting this to nil so we don't get stuck based on a popup that was
+				// previously opened
+				gui.Mutexes.PopupMutex.Lock()
+				gui.State.CurrentPopupOpts = nil
+				gui.Mutexes.PopupMutex.Unlock()

-		// setting this to nil so we don't get stuck based on a popup that was
-		// previously opened
-		gui.Mutexes.PopupMutex.Lock()
-		gui.State.CurrentPopupOpts = nil
-		gui.Mutexes.PopupMutex.Unlock()
-
-		return gui.c.CurrentContext()
+				return gui.c.CurrentContext()
+			}
+		} else {
+			gui.c.Log.Error(err)
+		}
 	}

 	contextTree := gui.contextTree()
@@ -349,7 +349,6 @@ func (gui *Gui) resetState(startArgs appTypes.StartArgs) types.Context {
 	initialScreenMode := initialScreenMode(startArgs, gui.Config)

 	gui.State = &GuiRepoState{
-		ViewsSetup: false,
 		Model: &types.Model{
 			CommitFiles:           nil,
 			Files:                 make([]*models.File, 0),
@@ -359,7 +358,6 @@ func (gui *Gui) resetState(startArgs appTypes.StartArgs) types.Context {
 			ReflogCommits:         make([]*models.Commit, 0),
 			BisectInfo:            git_commands.NewNullBisectInfo(),
 			FilesTrie:             patricia.NewTrie(),
-			Authors:               map[string]*models.Author{},
 		},
 		Modes: &types.Modes{
 			Filtering:     filtering.New(startArgs.FilterPath),
@@ -374,7 +372,7 @@ func (gui *Gui) resetState(startArgs appTypes.StartArgs) types.Context {
 		SearchState:       types.NewSearchState(),
 	}

-	gui.RepoStateMap[Repo(worktreePath)] = gui.State
+	gui.RepoStateMap[Repo(currentDir)] = gui.State

 	return initialContext(contextTree, startArgs)
 }
@@ -467,13 +465,11 @@ func NewGui(
 			SyncMutex:               &deadlock.Mutex{},
 			LocalCommitsMutex:       &deadlock.Mutex{},
 			SubCommitsMutex:         &deadlock.Mutex{},
-			AuthorsMutex:            &deadlock.Mutex{},
 			SubprocessMutex:         &deadlock.Mutex{},
 			PopupMutex:              &deadlock.Mutex{},
 			PtyMutex:                &deadlock.Mutex{},
 		},
-		InitialDir:       initialDir,
-		afterLayoutFuncs: make(chan func() error, 1000),
+		InitialDir: initialDir,
 	}

 	gui.WatchFilesForChanges()
@@ -534,29 +530,9 @@ var RuneReplacements = map[rune]string{
 }

 func (gui *Gui) initGocui(headless bool, test integrationTypes.IntegrationTest) (*gocui.Gui, error) {
-	runInSandbox := os.Getenv(components.SANDBOX_ENV_VAR) == "true"
-	playRecording := test != nil && !runInSandbox
+	playRecording := test != nil && os.Getenv(components.SANDBOX_ENV_VAR) != "true"

-	width, height := 0, 0
-	if test != nil {
-		if test.RequiresHeadless() {
-			if runInSandbox {
-				panic("Test requires headless, can't run in sandbox")
-			}
-			headless = true
-		}
-		width, height = test.HeadlessDimensions()
-	}
-
-	g, err := gocui.NewGui(gocui.NewGuiOpts{
-		OutputMode:       gocui.OutputTrue,
-		SupportOverlaps:  OverlappingEdges,
-		PlayRecording:    playRecording,
-		Headless:         headless,
-		RuneReplacements: RuneReplacements,
-		Width:            width,
-		Height:           height,
-	})
+	g, err := gocui.NewGui(gocui.OutputTrue, OverlappingEdges, playRecording, headless, RuneReplacements)
 	if err != nil {
 		return nil, err
 	}
@@ -565,21 +541,32 @@ func (gui *Gui) initGocui(headless bool, test integrationTypes.IntegrationTest)
 }

 func (gui *Gui) viewTabMap() map[string][]context.TabView {
-	result := map[string][]context.TabView{
-		"branches": {
-			{
-				Tab:      gui.c.Tr.LocalBranchesTitle,
-				ViewName: "localBranches",
-			},
-			{
-				Tab:      gui.c.Tr.RemotesTitle,
-				ViewName: "remotes",
-			},
-			{
-				Tab:      gui.c.Tr.TagsTitle,
-				ViewName: "tags",
-			},
+	branchesTabs := []context.TabView{
+		{
+			Tab:      gui.c.Tr.LocalBranchesTitle,
+			ViewName: "localBranches",
 		},
+		{
+			Tab:      gui.c.Tr.RemotesTitle,
+			ViewName: "remotes",
+		},
+		{
+			Tab:      gui.c.Tr.TagsTitle,
+			ViewName: "tags",
+		},
+	}
+
+	if gui.c.Git().Version.SupportsWorktrees() {
+		branchesTabs = append(branchesTabs,
+			context.TabView{
+				Tab:      gui.c.Tr.WorktreesTitle,
+				ViewName: "worktrees",
+			},
+		)
+	}
+
+	return map[string][]context.TabView{
+		"branches": branchesTabs,
 		"commits": {
 			{
 				Tab:      gui.c.Tr.CommitsTitle,
@@ -595,18 +582,12 @@ func (gui *Gui) viewTabMap() map[string][]context.TabView {
 				Tab:      gui.c.Tr.FilesTitle,
 				ViewName: "files",
 			},
-			context.TabView{
-				Tab:      gui.c.Tr.WorktreesTitle,
-				ViewName: "worktrees",
-			},
 			{
 				Tab:      gui.c.Tr.SubmodulesTitle,
 				ViewName: "submodules",
 			},
 		},
 	}
-
-	return result
 }

 // Run: setup the gui with keybindings and start the mainloop
@@ -655,7 +636,7 @@ func (gui *Gui) Run(startArgs appTypes.StartArgs) error {
 	}

 	// onNewRepo must be called after g.SetManager because SetManager deletes keybindings
-	if err := gui.onNewRepo(startArgs, context.NO_CONTEXT); err != nil {
+	if err := gui.onNewRepo(startArgs, false, context.NO_CONTEXT); err != nil {
 		return err
 	}

@@ -172,12 +172,3 @@ func (self *guiCommon) IsAnyModeActive() bool {
 func (self *guiCommon) GetInitialKeybindingsWithCustomCommands() ([]*types.Binding, []*gocui.ViewMouseBinding) {
 	return self.gui.GetInitialKeybindingsWithCustomCommands()
 }
-
-func (self *guiCommon) AfterLayout(f func() error) {
-	select {
-	case self.gui.afterLayoutFuncs <- f:
-	default:
-		// hopefully this never happens
-		self.gui.c.Log.Error("afterLayoutFuncs channel is full, skipping function")
-	}
-}
@@ -149,23 +149,7 @@ func (gui *Gui) layout(g *gocui.Gui) error {
 	// if you run `lazygit --logs`
 	// this will let you see these branches as prettified json
 	// gui.c.Log.Info(utils.AsJson(gui.State.Model.Branches[0:4]))
-	if err := gui.helpers.Confirmation.ResizeCurrentPopupPanel(); err != nil {
-		return err
-	}
-
-outer:
-	for {
-		select {
-		case f := <-gui.afterLayoutFuncs:
-			if err := f(); err != nil {
-				return err
-			}
-		default:
-			break outer
-		}
-	}
-
-	return nil
+	return gui.helpers.Confirmation.ResizeCurrentPopupPanel()
 }

 func (gui *Gui) prepareView(viewName string) (*gocui.View, error) {
@@ -175,10 +159,6 @@ func (gui *Gui) prepareView(viewName string) (*gocui.View, error) {
 }

 func (gui *Gui) onInitialViewsCreationForRepo() error {
-	if err := gui.onRepoViewReset(); err != nil {
-		return err
-	}
-
 	// hide any popup views. This only applies when we've just switched repos
 	for _, viewName := range gui.popupViewNames() {
 		view, err := gui.g.View(viewName)
@@ -205,7 +185,7 @@ func (gui *Gui) popupViewNames() []string {
 	})
 }

-func (gui *Gui) onRepoViewReset() error {
+func (gui *Gui) onInitialViewsCreation() error {
 	// now we order the views (in order of bottom first)
 	for _, view := range gui.orderedViews() {
 		if _, err := gui.g.SetViewOnTop(view.Name()); err != nil {
@@ -232,10 +212,6 @@ func (gui *Gui) onRepoViewReset() error {
 	}
 	gui.g.Mutexes.ViewsMutex.Unlock()

-	return nil
-}
-
-func (gui *Gui) onInitialViewsCreation() error {
 	if !gui.c.UserConfig.DisableStartupPopups {
 		storedPopupVersion := gui.c.GetAppState().StartupPopupVersion
 		if storedPopupVersion < StartupPopupVersion {
@@ -41,7 +41,7 @@ func (gui *Gui) createMenu(opts types.CreateMenuOptions) error {
 		}
 	}

-	gui.State.Contexts.Menu.SetMenuItems(opts.Items, opts.ColumnAlignment)
+	gui.State.Contexts.Menu.SetMenuItems(opts.Items)
 	gui.State.Contexts.Menu.SetSelectedLineIdx(0)

 	gui.Views.Menu.Title = opts.Title
@@ -155,11 +155,10 @@ func getFileLine(hasUnstagedChanges bool, hasStagedChanges bool, name string, di
 	}

 	isSubmodule := file != nil && file.IsSubmodule(submoduleConfigs)
-	isLinkedWorktree := file != nil && file.IsWorktree
 	isDirectory := file == nil

 	if icons.IsIconEnabled() {
-		output += restColor.Sprintf("%s ", icons.IconForFile(name, isSubmodule, isLinkedWorktree, isDirectory))
+		output += restColor.Sprintf("%s ", icons.IconForFile(name, isSubmodule, isDirectory))
 	}

 	output += restColor.Sprint(utils.EscapeSpecialChars(name))
@@ -194,11 +193,10 @@ func getCommitFileLine(name string, diffName string, commitFile *models.CommitFi
 	}

 	isSubmodule := false
-	isLinkedWorktree := false
 	isDirectory := commitFile == nil

 	if icons.IsIconEnabled() {
-		output += colour.Sprintf("%s ", icons.IconForFile(name, isSubmodule, isLinkedWorktree, isDirectory))
+		output += colour.Sprintf("%s ", icons.IconForFile(name, isSubmodule, isDirectory))
 	}

 	output += colour.Sprint(name)
@@ -323,7 +323,7 @@ func patchFileIconsForNerdFontsV2() {
 	extIconMap[".vue"] = "\ufd42"     // ﵂
 }

-func IconForFile(name string, isSubmodule bool, isLinkedWorktree bool, isDirectory bool) string {
+func IconForFile(name string, isSubmodule bool, isDirectory bool) string {
 	base := filepath.Base(name)
 	if icon, ok := nameIconMap[base]; ok {
 		return icon
@@ -336,8 +336,6 @@ func IconForFile(name string, isSubmodule bool, isLinkedWorktree bool, isDirecto

 	if isSubmodule {
 		return DEFAULT_SUBMODULE_ICON
-	} else if isLinkedWorktree {
-		return LINKED_WORKTREE_ICON
 	} else if isDirectory {
 		return DEFAULT_DIRECTORY_ICON
 	}
@@ -4,31 +4,31 @@ import (
 	"github.com/jesseduffield/lazygit/pkg/commands/models"
 	"github.com/jesseduffield/lazygit/pkg/gui/presentation/icons"
 	"github.com/jesseduffield/lazygit/pkg/gui/style"
-	"github.com/jesseduffield/lazygit/pkg/i18n"
 	"github.com/jesseduffield/lazygit/pkg/theme"
 	"github.com/samber/lo"
 )

-func GetWorktreeDisplayStrings(tr *i18n.TranslationSet, worktrees []*models.Worktree) [][]string {
+func GetWorktreeDisplayStrings(worktrees []*models.Worktree, isCurrent func(string) bool, isMissing func(string) bool) [][]string {
 	return lo.Map(worktrees, func(worktree *models.Worktree, _ int) []string {
 		return GetWorktreeDisplayString(
-			tr,
+			isCurrent(worktree.Path),
+			isMissing(worktree.Path),
 			worktree)
 	})
 }

-func GetWorktreeDisplayString(tr *i18n.TranslationSet, worktree *models.Worktree) []string {
+func GetWorktreeDisplayString(isCurrent bool, isPathMissing bool, worktree *models.Worktree) []string {
 	textStyle := theme.DefaultTextColor

 	current := ""
 	currentColor := style.FgCyan
-	if worktree.IsCurrent {
+	if isCurrent {
 		current = "  *"
 		currentColor = style.FgGreen
 	}

 	icon := icons.IconForWorktree(false)
-	if worktree.IsPathMissing {
+	if isPathMissing {
 		textStyle = style.FgRed
 		icon = icons.IconForWorktree(true)
 	}
@@ -39,12 +39,10 @@ func GetWorktreeDisplayString(tr *i18n.TranslationSet, worktree *models.Worktree
 		res = append(res, textStyle.Sprint(icon))
 	}

-	name := worktree.Name
-	if worktree.IsMain {
-		name += " " + tr.MainWorktree
-	}
-	if worktree.IsPathMissing && !icons.IsIconEnabled() {
-		name += " " + tr.MissingWorktree
+	name := worktree.Name()
+	if worktree.Main() {
+		// TODO: i18n
+		name += " (main worktree)"
 	}
 	res = append(res, textStyle.Sprint(name))
 	return res
@@ -28,8 +28,6 @@ func (gui *Gui) updateRecentRepoList() error {
 	}
 	known, recentRepos := newRecentReposList(recentRepos, currentRepo)
 	gui.IsNewRepo = known
-	// TODO: migrate this file to use forward slashes on all OSes for consistency
-	// (windows uses backslashes at the moment)
 	gui.c.GetAppState().RecentRepos = recentRepos
 	return gui.c.SaveAppState()
 }
@@ -33,7 +33,6 @@ type SessionState struct {
 	SelectedStashEntry     *models.StashEntry
 	SelectedCommitFile     *models.CommitFile
 	SelectedCommitFilePath string
-	SelectedWorktree       *models.Worktree
 	CheckedOutBranch       *models.Branch
 }

@@ -51,7 +50,6 @@ func (self *SessionStateLoader) call() *SessionState {
 		SelectedCommitFile:     self.c.Contexts().CommitFiles.GetSelectedFile(),
 		SelectedCommitFilePath: self.c.Contexts().CommitFiles.GetSelectedPath(),
 		SelectedSubCommit:      self.c.Contexts().SubCommits.GetSelected(),
-		SelectedWorktree:       self.c.Contexts().Worktrees.GetSelected(),
 		CheckedOutBranch:       self.refsHelper.GetCheckedOutRef(),
 	}
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Jesse Duffield	e57f6ff9c5	Better logic for knowing which repo we're in	2023-07-17 14:38:08 +10:00
Jesse Duffield	a748294bc1	Only show worktree in status panel if not the main worktree and worktrees are supported	2023-07-17 14:10:32 +10:00
Jesse Duffield	eb099c13c7	Hide worktree functionality on old git versions	2023-07-17 14:10:32 +10:00
Jesse Duffield	2ff12e6820	Associate branches with worktrees even when mid-rebase	2023-07-17 13:43:10 +10:00
Jesse Duffield	a8aafbc6af	Assume that the base of a worktree can be checked out	2023-07-17 09:48:37 +10:00
Jesse Duffield	67e6e4e8fd	i18n for worktrees	2023-07-17 09:46:14 +10:00
Jesse Duffield	a8d99a8ee7	Don't quit on error	2023-07-17 09:13:16 +10:00
Jesse Duffield	223143c834	Allow opening worktree in editor This does the job but I think we need yet another editor command for opening a directory in a new window.	2023-07-16 20:44:35 +10:00
Jesse Duffield	f6973cf7e4	Show base ref suggestions when creating worktree	2023-07-16 20:38:22 +10:00
Jesse Duffield	e1e7e9185e	Refresh work trees when discarding file changes We do this because we may be deleting a worktree folder so we'll need to show that in the worktrees view	2023-07-16 20:35:04 +10:00
Jesse Duffield	48d161dd1c	Checkout worktree when creating from worktree view	2023-07-16 20:35:04 +10:00
Jesse Duffield	8ce1ed23ce	Use 'M' for months in branches panel	2023-07-16 20:09:07 +10:00
Jesse Duffield	4d1352e3d0	Fix filtering logic in worktrees view	2023-07-16 20:07:04 +10:00
Jesse Duffield	a7367ffcc1	Support creating worktrees from refs	2023-07-16 20:07:04 +10:00
Jesse Duffield	cda40a7b75	Fix wording	2023-07-16 18:23:47 +10:00
Jesse Duffield	76c62eba7c	Log when directory is changed	2023-07-16 18:23:47 +10:00
Jesse Duffield	835ca6389e	Handle deleting branch attached to worktree	2023-07-16 17:59:41 +10:00
Jesse Duffield	bdaf0c99ba	Update wording	2023-07-16 17:31:52 +10:00
Jesse Duffield	c996c29df0	Don't touch repo stack when switching worktrees We shouldn't touch this cos we're doing a lateral move	2023-07-16 17:26:27 +10:00
Jesse Duffield	dc9a6e0ea5	Move status panel presentation logic into presentation package	2023-07-16 17:15:19 +10:00
Jesse Duffield	eaba9dd62d	Land in the same panel when switching to a worktree	2023-07-16 14:37:49 +10:00
Jesse Duffield	3cb13f14bf	Move current worktree to top of list	2023-07-16 14:23:31 +10:00
Jesse Duffield	5d52852df3	Prompt to switch to worktree when branch is checked out by other worktree	2023-07-16 14:14:09 +10:00
Jesse Duffield	7d4432c4b5	Use git lingo	2023-07-16 13:53:59 +10:00
Jesse Duffield	a1235fa468	Improve name handling	2023-07-16 13:43:20 +10:00
Jesse Duffield	8b90811c65	Use sentence case	2023-07-16 12:23:35 +10:00
Jesse Duffield	2dd2b9f5e3	Refactor	2023-07-16 12:21:43 +10:00
Jesse Duffield	e7484808e5	Update worktree model	2023-07-16 11:36:50 +10:00
Jesse Duffield	3245350bab	Alert when attempting to enter the current worktree	2023-07-16 11:20:22 +10:00
Jesse Duffield	6e51dd1c85	Remove comment	2023-07-16 11:16:10 +10:00
Joel Baranick	77db982774	Address PR comments	2023-07-16 11:04:39 +10:00
Joel Baranick	e16f56e492	Basic support for adding a worktree	2023-07-16 10:55:56 +10:00
Joel Baranick	3055944b5d	Put all worktree i18n strings together Use tabwriter to align worktree panel contents	2023-07-16 10:53:00 +10:00
Joel Baranick	6194b17ebb	Improve worktree panel	2023-07-16 10:50:25 +10:00
Joel Baranick	15ffb34474	Style missing worktree as red and display better error when trying to switch to them Use a broken link icon for missing worktrees	2023-07-16 10:48:22 +10:00
Joel Baranick	32409dbb2f	Hide worktrees in the worktree panel if they point at a non-existing filesystem location. Remove unneeded check when filtering out branches from non-current worktrees from the branch panel. Add link icon for linked worktrees	2023-07-16 10:32:36 +10:00
Joel Baranick	4ec960f07d	Update status to differentiate the main vs linked worktrees	2023-07-16 10:29:08 +10:00
Joel Baranick	a7bdc6be01	Support for deleting a worktree	2023-07-16 10:23:17 +10:00
Joel Baranick	271f894106	Initial addition of support for worktrees	2023-07-16 10:20:36 +10:00