go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-10-30 23:57:43 +02:00
Code Issues Releases Activity

remove useless check

Browse Source
This commit is contained in:
Anthony HAMON
2018-08-21 08:41:31 +02:00
parent 810155ef2f
commit 37681627ab
2 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/config/app_config.go
View File

@@ -121,10 +121,7 @@ func LoadUserConfigFromFile(v *viper.Viper) error {
folder = configDirs.QueryFolderContainsFile("config.yml") folder = configDirs.QueryFolderContainsFile("config.yml")
} }
v.AddConfigPath(folder.Path) v.AddConfigPath(folder.Path)
if err := v.MergeInConfig(); err != nil { return v.MergeInConfig()
return err
}
return nil
} }
// InsertToUserConfig adds a key/value pair to the user's config and saves it // InsertToUserConfig adds a key/value pair to the user's config and saves it
@@ -139,10 +136,7 @@ func (c *AppConfig) InsertToUserConfig(key, value string) error {
return err return err
} }
v.Set(key, value) v.Set(key, value)
if err := v.WriteConfig(); err != nil { return v.WriteConfig()
return err
}
return nil
} }
func getDefaultConfig() []byte { func getDefaultConfig() []byte {

6
pkg/test/test.go
View File

@@ -18,8 +18,6 @@ func GenerateRepo(filename string) error {
if output, err := exec.Command("bash", filename).CombinedOutput(); err != nil { if output, err := exec.Command("bash", filename).CombinedOutput(); err != nil {
return errors.New(string(output)) return errors.New(string(output))
} }
if err := os.Chdir(testPath + "repo"); err != nil {
return err return os.Chdir(testPath + "repo")
}
return nil
} }