diff options
| author | Stefan Haller <stefan@haller-berlin.de> | 2024-03-29 17:17:53 +0100 |
|---|---|---|
| committer | Stefan Haller <stefan@haller-berlin.de> | 2024-03-29 17:55:06 +0100 |
| commit | 8487bc397d8e78b85141214280c63683bcce6db2 (patch) | |
| tree | 5450422ce6dc54da843c3a2fa1b4f09f0a13fa45 /pkg | |
| parent | 93aee0dca0eda9ce51312e4d42040f69dcdfeaac (diff) | |
Remove our yaml fork
Switch back to the official go-yaml package.
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/config/app_config.go | 7 | ||||
| -rw-r--r-- | pkg/config/dummies.go | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/pkg/config/app_config.go b/pkg/config/app_config.go index aa891d1f1..cd0d3e316 100644 --- a/pkg/config/app_config.go +++ b/pkg/config/app_config.go @@ -8,8 +8,7 @@ import ( "github.com/adrg/xdg" "github.com/jesseduffield/lazygit/pkg/utils/yaml_utils" - yaml "github.com/jesseduffield/yaml" - yaml3 "gopkg.in/yaml.v3" + "gopkg.in/yaml.v3" ) // AppConfig contains the base configuration fields required for lazygit. @@ -200,8 +199,8 @@ func migrateUserConfig(path string, content []byte) ([]byte, error) { } func changeNullKeybindingsToDisabled(changedContent []byte) ([]byte, error) { - return yaml_utils.Walk(changedContent, func(node *yaml3.Node, path string) bool { - if strings.HasPrefix(path, "keybinding.") && node.Kind == yaml3.ScalarNode && node.Tag == "!!null" { + return yaml_utils.Walk(changedContent, func(node *yaml.Node, path string) bool { + if strings.HasPrefix(path, "keybinding.") && node.Kind == yaml.ScalarNode && node.Tag == "!!null" { node.Value = "<disabled>" node.Tag = "!!str" return true diff --git a/pkg/config/dummies.go b/pkg/config/dummies.go index 08150c765..077c93c57 100644 --- a/pkg/config/dummies.go +++ b/pkg/config/dummies.go @@ -1,7 +1,7 @@ package config import ( - yaml "github.com/jesseduffield/yaml" + "gopkg.in/yaml.v3" ) // NewDummyAppConfig creates a new dummy AppConfig for testing |