Show worktrees in the repository sidebar

.github/CODEOWNERS

@@ -0,0 +1,2 @@
+# Automatically request review from desktop/code-reviewers on all PRs
+* @desktop/code-reviewers

app/package.json

@@ -5,7 +5,7 @@
   "productName": "GitHub Desktop Plus",
   "bundleID": "com.github.GitHubClient",
   "companyName": "GitHub, Inc.",
-  "version": "3.5.7-beta2",
+  "version": "3.5.7",
   "main": "./main.js",
   "repository": {
     "type": "git",

app/src/lib/app-state.ts

@@ -1,5 +1,6 @@
 import { Account } from '../models/account'
 import { CommitIdentity } from '../models/commit-identity'
+import { IConfigValueOrigin } from './git/config'
 import { IDiff, ImageDiffType } from '../models/diff'
 import { Repository, ILocalRepositoryState } from '../models/repository'
 import { Branch, IAheadBehind } from '../models/branch'
@@ -321,6 +322,9 @@ export interface IAppState {
   /** Whether or not the worktrees dropdown should be shown in the toolbar */
   readonly showWorktrees: boolean
 
+  /** Whether linked worktrees should be shown under their repository in the sidebar */
+  readonly showWorktreesInSidebar: boolean
+
   /** Whether or not the Compare tab should be shown in the repository view */
   readonly showCompareTab: boolean
 
@@ -363,6 +367,8 @@ export interface IAppState {
    */
   readonly commitSpellcheckEnabled: boolean
 
+  readonly showCommitAuthorInfo: boolean
+
   /**
    * Record of what logged in users have been checked to see if thank you is in
    * order for external contributions in latest release.
@@ -562,6 +568,9 @@ export interface IRepositoryState {
    */
   readonly commitAuthor: CommitIdentity | null
 
+  readonly commitAuthorNameOrigin: IConfigValueOrigin | null
+  readonly commitAuthorEmailOrigin: IConfigValueOrigin | null
+
   readonly branchesState: IBranchesState
 
   readonly worktreesState: IWorktreesState

app/src/lib/git/config.ts

@@ -282,3 +282,111 @@ async function removeConfigValueInPath(
 
   await git(flags, path || __dirname, 'removeConfigValueInPath', options)
 }
+
+export interface IConfigValueOrigin {
+  readonly value: string
+  readonly scope: string
+  readonly origin: string
+}
+
+/**
+ * Look up a config value along with its source file and scope.
+ * Requires Git 2.26+ for --show-scope.
+ */
+export async function getConfigValueWithOrigin(
+  repository: Repository,
+  name: string
+): Promise<IConfigValueOrigin | null> {
+  const result = await git(
+    ['config', '--show-origin', '--show-scope', '-z', name],
+    repository.path,
+    'getConfigValueWithOrigin',
+    // 0 = found, 1 = key not set, 128 = not a git repo or git error
+    { successExitCodes: new Set([0, 1, 128]) }
+  )
+
+  if (result.exitCode !== 0) {
+    return null
+  }
+
+  const parts = result.stdout.split('\0')
+  if (parts.length >= 3) {
+    return {
+      scope: parts[0],
+      origin: parts[1],
+      value: parts[2],
+    }
+  }
+
+  return null
+}
+
+/**
+ * Extract the file path from a config value origin, stripping the `file:` prefix.
+ * When repositoryPath is provided, relative paths (e.g. `.git/config` for local
+ * scope) are resolved to absolute paths.
+ */
+export function getOriginFilePath(
+  origin: IConfigValueOrigin,
+  repositoryPath?: string
+): string {
+  const filePath = origin.origin.replace(/^file:/, '')
+  // Git returns relative paths for local/worktree scope (e.g. `.git/config`)
+  if (repositoryPath && !/^([a-zA-Z]:|[/\\])/.test(filePath)) {
+    const base = repositoryPath.replace(/[\\/]+$/, '')
+    return `${base}/${filePath}`
+  }
+  return filePath
+}
+
+/**
+ * Check whether a global-scoped config value comes from a conditionally
+ * included file (via includeIf directive) rather than a standard location.
+ */
+export function isConditionalInclude(origin: IConfigValueOrigin): boolean {
+  if (origin.scope !== 'global') {
+    return false
+  }
+  const filePath = getOriginFilePath(origin)
+  return (
+    !/[/\\]\.gitconfig$/i.test(filePath) &&
+    !/[/\\]\.config[/\\]git[/\\]config$/i.test(filePath)
+  )
+}
+
+/** Format a human-readable scope description for a config value origin. */
+export function formatConfigScope(origin: IConfigValueOrigin): string {
+  if (origin.scope === 'local') {
+    return 'local'
+  } else if (origin.scope === 'system') {
+    return 'system'
+  } else if (origin.scope === 'worktree') {
+    return 'worktree'
+  } else if (origin.scope === 'global') {
+    return isConditionalInclude(origin) ? 'global, via [includeIf]' : 'global'
+  }
+  return origin.scope
+}
+
+/**
+ * Format the file path for a config value origin.
+ * For local/worktree scope, displays the path with a `<repo>` prefix.
+ */
+export function formatConfigPath(
+  origin: IConfigValueOrigin,
+  repositoryPath: string
+): string {
+  const rawPath = origin.origin.replace(/^file:/, '')
+  if (origin.scope === 'local' || origin.scope === 'worktree') {
+    // Git returns relative paths for local scope (e.g. `.git/config`)
+    if (!/^([a-zA-Z]:|[/\\])/.test(rawPath)) {
+      return '<repo>/' + rawPath
+    }
+    // Absolute path — strip repo prefix
+    const normalized = repositoryPath.replace(/[\\/]+$/, '')
+    if (rawPath.toLowerCase().startsWith(normalized.toLowerCase())) {
+      return '<repo>' + rawPath.slice(normalized.length)
+    }
+  }
+  return rawPath
+}

app/src/lib/git/worktree.ts

@@ -5,6 +5,15 @@ import type { WorktreeEntry, WorktreeType } from '../../models/worktree'
 import { git } from './core'
 import { normalizePath } from '../helpers/path'
 
+function getDotGitPath(repositoryPath: string): string {
+  return Path.join(repositoryPath, '.git')
+}
+
+export interface IWorktreePathInfo {
+  readonly isLinkedWorktree: boolean
+  readonly mainWorktreePath: string | null
+}
+
 export function parseWorktreePorcelainOutput(
   stdout: string
 ): ReadonlyArray<WorktreeEntry> {
@@ -104,6 +113,10 @@ export async function removeWorktree(
   await git(args, repository.path, 'removeWorktree')
 }
 
+export async function pruneWorktrees(repository: Repository): Promise<void> {
+  await git(['worktree', 'prune'], repository.path, 'pruneWorktrees')
+}
+
 export async function moveWorktree(
   repository: Repository,
   oldPath: string,
@@ -135,17 +148,48 @@ export async function getMainWorktreePath(
   return main?.path ?? null
 }
 
-/**
- * Synchronously checks if a repository path is a linked worktree by examining
- * whether `.git` is a file (linked worktree) or directory (main worktree).
- */
-export function isLinkedWorktreeSync(repositoryPath: string): boolean {
+export function getWorktreePathInfoSync(
+  repositoryPath: string
+): IWorktreePathInfo | null {
   try {
-    const dotGit = Path.join(repositoryPath, '.git')
+    const dotGit = getDotGitPath(repositoryPath)
     // eslint-disable-next-line no-sync
     const stats = Fs.statSync(dotGit)
-    return stats.isFile()
+
+    if (stats.isDirectory()) {
+      return { isLinkedWorktree: false, mainWorktreePath: repositoryPath }
+    }
+
+    if (!stats.isFile()) {
+      return null
+    }
+
+    // eslint-disable-next-line no-sync
+    const contents = Fs.readFileSync(dotGit, 'utf8').trim()
+    if (!contents.startsWith('gitdir: ')) {
+      return null
+    }
+
+    const gitDirPath = Path.resolve(
+      repositoryPath,
+      contents.substring('gitdir: '.length)
+    )
+
+    // eslint-disable-next-line no-sync
+    const commondir = Fs.readFileSync(
+      Path.join(gitDirPath, 'commondir'),
+      'utf8'
+    ).trim()
+    if (commondir.length === 0) {
+      return null
+    }
+
+    const commonGitDir = Path.resolve(gitDirPath, commondir)
+    return {
+      isLinkedWorktree: true,
+      mainWorktreePath: Path.dirname(commonGitDir),
+    }
   } catch {
-    return false
+    return null
   }
 }

app/src/lib/stats/stats-store.ts

@@ -42,6 +42,7 @@ import { getRendererGUID } from '../get-renderer-guid'
 import { ValidNotificationPullRequestReviewState } from '../valid-notification-pull-request-review'
 import { useExternalCredentialHelperKey } from '../trampoline/use-external-credential-helper'
 import { getUserAgent } from '../http'
+import { getHooksEnvEnabled } from '../hooks/config'
 
 type PullRequestReviewStatFieldInfix =
   | 'Approved'
@@ -428,6 +429,9 @@ interface ICalculatedStats {
    * Whether or not the user has the filtering changes enabled
    **/
   readonly filteringChangesEnabled: boolean
+
+  /** Whether or not the user has the git hooks environment enabled */
+  readonly gitHooksEnvEnabled: boolean
 }
 
 type DailyStats = ICalculatedStats &
@@ -646,6 +650,7 @@ export class StatsStore implements IStatsStore {
       diffCheckMarksVisible,
       useExternalCredentialHelper,
       filteringChangesEnabled,
+      gitHooksEnvEnabled: getHooksEnvEnabled(),
     }
   }