go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-04-17 12:06:38 +02:00
Code Issues Releases Activity

Revert "Add user config gui.commitAuthorFormat (#3625)"

Browse Source 
This reverts commit 3af545daf7cf6458e8efd324012047ce688f08e6, reversing
changes made to 629b7ba1b8f634c26adad43ffe44ed601d652f0c.

We changed our mind about this and want to provide different options for
achieving the same thing, but with more flexibility.
This commit is contained in:
Stefan Haller 2024-06-23 14:54:27 +02:00
parent 5dbdbd8425
commit 7be82d4713
5 changed files with 2 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docs/Config.md
View File

@ -185,11 +185,6 @@ gui:
# If true (default), file icons are shown in the file views. Only relevant if NerdFontsVersion is not empty.
showFileIcons: true
# Whether to show full author names or their shortened form in the commit graph.
# One of 'auto' (default) | 'full' | 'short'
# If 'auto', initials will be shown in small windows, and full names - in larger ones.
commitAuthorFormat: auto
# Length of commit hash in commits view. 0 shows '*' if NF icons aren't on.
commitHashLength: 8

5
pkg/config/user_config.go
View File

@ -125,10 +125,6 @@ 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"`
// Whether to show full author names or their shortened form in the commit graph.
// One of 'auto' (default) | 'full' | 'short'
// If 'auto', initials will be shown in small windows, and full names - in larger ones.
CommitAuthorFormat string `yaml:"commitAuthorFormat" jsonschema:"enum=auto,enum=short,enum=full"`
// Length of commit hash in commits view. 0 shows '*' if NF icons aren't on.
CommitHashLength int `yaml:"commitHashLength" jsonschema:"minimum=0"`
// If true, show commit hashes alongside branch names in the branches view.
@ -687,7 +683,6 @@ func GetDefaultConfig() *UserConfig {
UnstagedChangesColor: []string{"red"},
DefaultFgColor: []string{"default"},
},
CommitAuthorFormat: "auto",
CommitLength: CommitLengthConfig{Show: true},
SkipNoStagedFilesWarning: false,
ShowListFooter: true,

5
pkg/config/user_config_validation.go
View File

@ -7,11 +7,6 @@ import (
)
func (config *UserConfig) Validate() error {
if err := validateEnum("gui.commitAuthorFormat", config.Gui.CommitAuthorFormat,
[]string{"auto", "short", "full"}); err != nil {
return err
}
if err := validateEnum("gui.statusPanelView", config.Gui.StatusPanelView,
[]string{"dashboard", "allBranchesLog"}); err != nil {
return err

9
pkg/gui/presentation/commits.go
View File

@ -440,14 +440,9 @@ func displayCommit(
mark = fmt.Sprintf("%s ", willBeRebased)
}
var authorFunc func(string) string
switch common.UserConfig.Gui.CommitAuthorFormat {
case "short":
authorFunc = authors.ShortAuthor
case "full":
authorFunc := authors.ShortAuthor
if fullDescription {
authorFunc = authors.LongAuthor
default:
authorFunc = lo.Ternary(fullDescription, authors.LongAuthor, authors.ShortAuthor)
}
cols := make([]string, 0, 7)

10
schema/config.json
View File

@ -332,16 +332,6 @@
"description": "If true (default), file icons are shown in the file views. Only relevant if NerdFontsVersion is not empty.",
"default": true
},
"commitAuthorFormat": {
"type": "string",
"enum": [
"auto",
"short",
"full"
],
"description": "Whether to show full author names or their shortened form in the commit graph.\nOne of 'auto' (default) | 'full' | 'short'\nIf 'auto', initials will be shown in small windows, and full names - in larger ones.",
"default": "auto"
},
"commitHashLength": {
"type": "integer",
"minimum": 0,