Fix right-alignment of divergence from base branch for branch checked out in a worktree

stefanhaller · stefanhaller · commit e54a8b2ee788 · 2025-08-14T14:28:11.000+02:00
We didn't take the worktree icon into account properly, so the divergence
indication was offset to the left by two characters in this case.
diff --git a/pkg/gui/presentation/branches.go b/pkg/gui/presentation/branches.go
@@ -71,10 +71,11 @@ func getBranchDisplayStrings(
 	if showCommitHash {
 		availableWidth -= utils.COMMIT_HASH_SHORT_SIZE + 1
 	}
+	paddingNeededForDivergence := availableWidth
+
 	if checkedOutByWorkTree {
 		availableWidth -= utils.StringWidth(worktreeIcon) + 1
 	}
-	paddingNeededForDivergence := availableWidth
 
 	if len(branchStatus) > 0 {
 		availableWidth -= utils.StringWidth(utils.Decolorise(branchStatus)) + 1

Original file line number	Diff line number	Diff line change
`@@ -71,10 +71,11 @@ func getBranchDisplayStrings(`
`71`	`71`	`if showCommitHash {`
`72`	`72`	`availableWidth -= utils.COMMIT_HASH_SHORT_SIZE + 1`
`73`	`73`	`}`
	`74`	`+ paddingNeededForDivergence := availableWidth`
	`75`	`+`
`74`	`76`	`if checkedOutByWorkTree {`
`75`	`77`	`availableWidth -= utils.StringWidth(worktreeIcon) + 1`
`76`	`78`	`}`
`77`		`- paddingNeededForDivergence := availableWidth`
`78`	`79`
`79`	`80`	`if len(branchStatus) > 0 {`
`80`	`81`	`availableWidth -= utils.StringWidth(utils.Decolorise(branchStatus)) + 1`