go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-06-08 23:56:15 +02:00
Code Issues Releases Activity

Remove pointless reloading of UserConfig

Browse Source 
It was added in 043cb2ea44, and the commit message was "reload config whenever
returning to gui". I don't understand what this means; Run() is called exactly
once after startup, so it would just reload the config again for no reason.

We will add a real way of reloading the config whenever it has changed later in
this branch.
This commit is contained in:
Stefan Haller 2024-03-30 15:07:52 +01:00
parent 48bb3a9dce
commit cd0f72d66a
2 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/config/app_config.go
View File

@ -36,7 +36,6 @@ type AppConfigurer interface {
GetUserConfig() *UserConfig GetUserConfig() *UserConfig
GetUserConfigPaths() []string GetUserConfigPaths() []string
GetUserConfigDir() string GetUserConfigDir() string
ReloadUserConfig() error
GetTempDir() string GetTempDir() string
GetAppState() *AppState GetAppState() *AppState
@ -252,16 +251,6 @@ func (c *AppConfig) GetUserConfigDir() string {
return c.userConfigDir return c.userConfigDir
} }
func (c *AppConfig) ReloadUserConfig() error {
userConfig, err := loadUserConfigWithDefaults(c.userConfigPaths)
if err != nil {
return err
}
c.userConfig = userConfig
return nil
}
func (c *AppConfig) GetTempDir() string { func (c *AppConfig) GetTempDir() string {
return c.tempDir return c.tempDir
} }

3
pkg/gui/gui.go
View File

@ -658,9 +658,6 @@ func (gui *Gui) Run(startArgs appTypes.StartArgs) error {
// breakpoints and stepping through code can easily take more than 30s. // breakpoints and stepping through code can easily take more than 30s.
deadlock.Opts.Disable = !gui.Debug || os.Getenv(components.WAIT_FOR_DEBUGGER_ENV_VAR) != "" deadlock.Opts.Disable = !gui.Debug || os.Getenv(components.WAIT_FOR_DEBUGGER_ENV_VAR) != ""
if err := gui.Config.ReloadUserConfig(); err != nil {
return nil
}
userConfig := gui.UserConfig userConfig := gui.UserConfig
gui.g.OnSearchEscape = func() error { gui.helpers.Search.Cancel(); return nil } gui.g.OnSearchEscape = func() error { gui.helpers.Search.Cancel(); return nil }