Fix issue where using null to un-map a keybinding was ignored (#2832)

jesseduffield · Jul 26, 2023 · decb055 · decb055
2 parents 35c430c + 75674d8
commit decb055
Show file tree

Hide file tree

Showing 22 changed files with 9,877 additions and 2 deletions.
diff --git a/go.mod b/go.mod
@@ -22,6 +22,7 @@ require (
 	github.com/jesseduffield/kill v0.0.0-20220618033138-bfbe04675d10
 	github.com/jesseduffield/lazycore v0.0.0-20221012050358-03d2e40243c5
 	github.com/jesseduffield/minimal/gitignore v0.3.3-0.20211018110810-9cde264e6b1e
+	github.com/jesseduffield/yaml v2.1.0+incompatible
 	github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0
 	github.com/kyokomi/emoji/v2 v2.2.8
 	github.com/lucasb-eyer/go-colorful v1.2.0

diff --git a/go.sum b/go.sum
@@ -80,6 +80,8 @@ github.com/jesseduffield/lazycore v0.0.0-20221012050358-03d2e40243c5 h1:CDuQmfOj
 github.com/jesseduffield/lazycore v0.0.0-20221012050358-03d2e40243c5/go.mod h1:qxN4mHOAyeIDLP7IK7defgPClM/z1Kze8VVQiaEjzsQ=
 github.com/jesseduffield/minimal/gitignore v0.3.3-0.20211018110810-9cde264e6b1e h1:uw/oo+kg7t/oeMs6sqlAwr85ND/9cpO3up3VxphxY0U=
 github.com/jesseduffield/minimal/gitignore v0.3.3-0.20211018110810-9cde264e6b1e/go.mod h1:u60qdFGXRd36jyEXxetz0vQceQIxzI13lIo3EFUDf4I=
+github.com/jesseduffield/yaml v2.1.0+incompatible h1:HWQJ1gIv2zHKbDYNp0Jwjlj24K8aqpFHnMCynY1EpmE=
+github.com/jesseduffield/yaml v2.1.0+incompatible/go.mod h1:w0xGhOSIJCGYYW+hnFPTutCy5aACpkcwbmORt5axGqk=
 github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
 github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 h1:iQTw/8FWTuc7uiaSepXwyf3o52HaUYcV+Tu66S3F5GA=
 github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8=

diff --git a/pkg/config/app_config.go b/pkg/config/app_config.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/OpenPeeDeeP/xdg"
 	"github.com/jesseduffield/lazygit/pkg/utils/yaml_utils"
-	"gopkg.in/yaml.v3"
+	yaml "github.com/jesseduffield/yaml"
 )
 
 // AppConfig contains the base configuration fields required for lazygit.

diff --git a/pkg/config/dummies.go b/pkg/config/dummies.go
@@ -1,7 +1,7 @@
 package config
 
 import (
-	"gopkg.in/yaml.v3"
+	yaml "github.com/jesseduffield/yaml"
 )
 
 // NewDummyAppConfig creates a new dummy AppConfig for testing

diff --git a/vendor/github.com/jesseduffield/yaml/LICENSE b/vendor/github.com/jesseduffield/yaml/LICENSE
diff --git a/vendor/github.com/jesseduffield/yaml/LICENSE.libyaml b/vendor/github.com/jesseduffield/yaml/LICENSE.libyaml
diff --git a/vendor/github.com/jesseduffield/yaml/NOTICE b/vendor/github.com/jesseduffield/yaml/NOTICE