Remove commitStatusChar option and fix double space issue

- Remove commitStatusChar config option and hardcode '*' instead
- Change logic in `commits.go` so it only colors non empty strings

docs/Config.md

@@ -80,8 +80,7 @@ gui:
  showIcons: false # deprecated: use nerdFontsVersion instead
  nerdFontsVersion: "" # nerd fonts version to use ("2" or "3"); empty means don't show nerd font icons
  showFileIcons: true # for hiding file icons in the file views
- commitHashLength: 8 # length of commit hash in commits view
- commitStatusChar: "●" # What to show instead of hash if commitHashLength==0 and NF icons aren't on. Empty string to show nothing.
+ commitHashLength: 8 # length of commit hash in commits view. 0 shows '*' if NF icons aren't enabled
  commandLogSize: 8
  splitDiff: 'auto' # one of 'auto' | 'always'
  skipRewordInEditorWarning: false # for skipping the confirmation before launching the reword editor

pkg/config/user_config.go

@@ -123,12 +123,8 @@ type GuiConfig struct {
  NerdFontsVersion string `yaml:"nerdFontsVersion" jsonschema:"enum=2,enum=3,enum="`
  // If true (default), file icons are shown in the file views. Only relevant if NerdFontsVersion is not empty.
  ShowFileIcons bool `yaml:"showFileIcons"`
- // Length of commit hash in commits view.
- // If 0 and NF icons aren't enabled, show 'commitStatusChar' instead of hash.
+ // Length of commit hash in commits view. 0 shows '*' if NF icons aren't on.
  CommitHashLength int `yaml:"commitHashLength" jsonschema:"minimum=0"`
- // What to show instead of hash if commitHashLength==0 and NF icons aren't on
- // Empty string to show nothing
- CommitStatusChar string `yaml:"commitStatusChar"`
  // If true, show commit hashes alongside branch names in the branches view.
  ShowBranchCommitHash bool `yaml:"showBranchCommitHash"`
  // Height of the command log view
@@ -682,7 +678,6 @@ func GetDefaultConfig() *UserConfig {
  NerdFontsVersion: "",
  ShowFileIcons: true,
  CommitHashLength: 8,
- CommitStatusChar: "●",
  ShowBranchCommitHash: false,
  CommandLogSize: 8,
  SplitDiff: "auto",

pkg/gui/presentation/commits.go

@@ -314,15 +314,16 @@ func displayCommit(
 ) []string {
  bisectString := getBisectStatusText(bisectStatus, bisectInfo)
 
- hashString := commit.Hash
+ hashString := ""
  hashColor := getHashColor(commit, diffName, cherryPickedCommitHashSet, bisectStatus, bisectInfo)
  hashLength := common.UserConfig.Gui.CommitHashLength
- if hashLength == 0 && !icons.IsIconEnabled() { // if no icons and no hash, show a char so user still sees status color
- hashString = common.UserConfig.Gui.CommitStatusChar
- } else if hashLength < len(hashString) {
- hashString = hashString[:hashLength]
+ if hashLength >= len(commit.Hash) {
+ hashString = hashColor.Sprint(commit.Hash)
+ } else if hashLength > 0 {
+ hashString = hashColor.Sprint(commit.Hash[:hashLength])
+ } else if !icons.IsIconEnabled() { // hashLength == 0
+ hashString = hashColor.Sprint("*")
  }
- hashString = hashColor.Sprint(hashString)
 
  divergenceString := ""
  if commit.Divergence != models.DivergenceNone {

schema/config.json

@@ -312,14 +312,9 @@
  "commitHashLength": {
  "type": "integer",
  "minimum": 0,
- "description": "Length of commit hash in commits view.\nIf 0 and NF icons aren't enabled, show 'commitStatusChar' instead of hash.",
+ "description": "Length of commit hash in commits view. 0 shows '*' if NF icons aren't on.",
  "default": 8
  },
- "commitStatusChar": {
- "type": "string",
- "description": "What to show instead of hash if commitHashLength==0 and NF icons aren't on\nEmpty string to show nothing",
- "default": "●"
- },
  "showBranchCommitHash": {
  "type": "boolean",
  "description": "If true, show commit hashes alongside branch names in the branches view."