mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-04-27 12:32:37 +02:00
Drop the git config cache when getting focus
This allows changing git config values while lazygit is running (e.g. in a different terminal tab, or even in lazygit's ":" shell prompt), and have them take effect immediately, while still getting some benefit from caching them while lazygit is in the foreground.
This commit is contained in:
parent
f98ad65f46
commit
3e15be576e
@ -111,3 +111,7 @@ func (self *ConfigCommands) GetCoreCommentChar() byte {
|
|||||||
func (self *ConfigCommands) GetRebaseUpdateRefs() bool {
|
func (self *ConfigCommands) GetRebaseUpdateRefs() bool {
|
||||||
return self.gitConfig.GetBool("rebase.updateRefs")
|
return self.gitConfig.GetBool("rebase.updateRefs")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (self *ConfigCommands) DropConfigCache() {
|
||||||
|
self.gitConfig.DropCache()
|
||||||
|
}
|
||||||
|
@ -15,6 +15,8 @@ type IGitConfig interface {
|
|||||||
GetGeneral(string) string
|
GetGeneral(string) string
|
||||||
// this is for when you want to pass 'mykey' and check if the result is truthy
|
// this is for when you want to pass 'mykey' and check if the result is truthy
|
||||||
GetBool(string) bool
|
GetBool(string) bool
|
||||||
|
|
||||||
|
DropCache()
|
||||||
}
|
}
|
||||||
|
|
||||||
type CachedGitConfig struct {
|
type CachedGitConfig struct {
|
||||||
@ -93,3 +95,10 @@ func isTruthy(value string) bool {
|
|||||||
lcValue := strings.ToLower(value)
|
lcValue := strings.ToLower(value)
|
||||||
return lcValue == "true" || lcValue == "1" || lcValue == "yes" || lcValue == "on"
|
return lcValue == "true" || lcValue == "1" || lcValue == "yes" || lcValue == "on"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (self *CachedGitConfig) DropCache() {
|
||||||
|
self.mutex.Lock()
|
||||||
|
defer self.mutex.Unlock()
|
||||||
|
|
||||||
|
self.cache = make(map[string]string)
|
||||||
|
}
|
||||||
|
@ -27,3 +27,6 @@ func (self *FakeGitConfig) GetGeneral(args string) string {
|
|||||||
func (self *FakeGitConfig) GetBool(key string) bool {
|
func (self *FakeGitConfig) GetBool(key string) bool {
|
||||||
return isTruthy(self.Get(key))
|
return isTruthy(self.Get(key))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (self *FakeGitConfig) DropCache() {
|
||||||
|
}
|
||||||
|
@ -331,6 +331,8 @@ func (gui *Gui) onNewRepo(startArgs appTypes.StartArgs, contextKey types.Context
|
|||||||
|
|
||||||
gui.g.SetFocusHandler(func(Focused bool) error {
|
gui.g.SetFocusHandler(func(Focused bool) error {
|
||||||
if Focused {
|
if Focused {
|
||||||
|
gui.git.Config.DropConfigCache()
|
||||||
|
|
||||||
oldConfig := gui.Config.GetUserConfig()
|
oldConfig := gui.Config.GetUserConfig()
|
||||||
reloadErr, didChange := gui.Config.ReloadChangedUserConfigFiles()
|
reloadErr, didChange := gui.Config.ReloadChangedUserConfigFiles()
|
||||||
if didChange && reloadErr == nil {
|
if didChange && reloadErr == nil {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user