mirrors/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-05-11 04:15:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Include migration changes in the error message if we can't log them

Browse source 
This is for the unlikely case that a repo-local config file can't be written
back after migration; in this case we can't log the migration changes to the
console, so include them in the error popup instead.
This commit is contained in:
Stefan Haller 2025-05-09 09:31:42 +02:00
parent 7a2d5fcec9
commit 2e4ba67b12
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
pkg/config/app_config.go
View file

@ -244,7 +244,11 @@ func migrateUserConfig(path string, content []byte, isGuiInitialized bool) ([]by
fmt.Println(changesText) fmt.Println(changesText)
} }
if err := os.WriteFile(path, changedContent, 0o644); err != nil { if err := os.WriteFile(path, changedContent, 0o644); err != nil {
return nil, fmt.Errorf("While attempting to write back fixed user config to %s, an error occurred: %s", path, err) errorMsg := fmt.Sprintf("While attempting to write back migrated user config to %s, an error occurred: %s", path, err)
if isGuiInitialized {
errorMsg += "\n\n" + changesText
}
return nil, errors.New(errorMsg)
} }
if !isGuiInitialized { if !isGuiInitialized {
fmt.Printf("Config file saved successfully to %s\n", path) fmt.Printf("Config file saved successfully to %s\n", path)