mirror of
				https://github.com/jesseduffield/lazygit.git
				synced 2025-10-30 23:57:43 +02:00 
			
		
		
		
	Revert "Add user config gui.commitAuthorFormat (#3625)"
This reverts commit3af545daf7, reversing changes made to629b7ba1b8. 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:
		| @@ -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 | ||||
|  | ||||
|   | ||||
| @@ -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, | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
| @@ -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) | ||||
|   | ||||
| @@ -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, | ||||
|   | ||||
		Reference in New Issue
	
	Block a user