Merge pull request #10 from git-remote-gitopia/release-v1.6.0

Author: gitopia1c2zfrmhra3spfrc2m5ft64hef30guf60lvtcm3

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 All notable changes will be documented here.
 
+## [v1.6.0] - 2023-06-07
+
+- fix os keyring wallet in case of feegrant
+- use gitopia-go instead of cosmosclient for os keyring wallet support
+
 ## [v1.5.0] - 2023-05-17
 
 - git credential helper for git lfs

core/util.go

@@ -23,9 +23,10 @@ func GitCommand(name string, args ...string) (*exec.Cmd, io.Reader) {
 	cmd := exec.Command(name, args...)
 	cmd.Env = os.Environ()
 
-	cmd.Stdout = os.Stdout
-	cmd.Stderr = os.Stderr
-	return cmd, nil
+	r, _ := cmd.StdoutPipe()
+	cmd.Stderr = cmd.Stdout
+
+	return cmd, r
 }
 
 func CleanUpProcessGroup(cmd *exec.Cmd) {

go.mod

@@ -4,7 +4,7 @@ go 1.19
 
 require (
 	github.com/cosmos/cosmos-sdk v0.46.12
-	github.com/gitopia/gitopia-go v0.3.4-0.20230606152806-95aa197de17e
+	github.com/gitopia/gitopia-go v0.4.0
 	github.com/gitopia/gitopia/v2 v2.0.1
 	github.com/go-git/go-git/v5 v5.5.1
 	github.com/pkg/errors v0.9.1
@@ -176,5 +176,3 @@ require (
 replace github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
 
 replace github.com/tendermint/tendermint => github.com/cometbft/cometbft v0.34.27
-
-replace github.com/ignite/cli => github.com/gitopia/ignite-cli v0.24.0-fee-grant.4

go.sum

@@ -204,12 +204,8 @@ github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4
 github.com/fsnotify/fsnotify v1.5.4 h1:jRbGcIw6P2Meqdwuo0H1p6JVLbL5DHKAKlYndzMwVZI=
 github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
-github.com/gitopia/gitopia-go v0.3.3 h1:hXPj00AJ9Rqfrvv8XoOUrcFGLT7Pkbz1fdt9b/LfkvM=
-github.com/gitopia/gitopia-go v0.3.3/go.mod h1:1in+bQqP/CFduTIvJbB8WowPGRBhvyFkp+ZhBddutt0=
-github.com/gitopia/gitopia-go v0.3.4-0.20230606040529-35a837b457c9 h1:YRw8ZTqK8CZ3W4cys2yvsomCDko5VQXE7jPsdGtexNw=
-github.com/gitopia/gitopia-go v0.3.4-0.20230606040529-35a837b457c9/go.mod h1:1in+bQqP/CFduTIvJbB8WowPGRBhvyFkp+ZhBddutt0=
-github.com/gitopia/gitopia-go v0.3.4-0.20230606152806-95aa197de17e h1:8sE+tXxZDvbuuBxCWMAIpGukL5BklOYSoL9b44QOiqc=
-github.com/gitopia/gitopia-go v0.3.4-0.20230606152806-95aa197de17e/go.mod h1:1in+bQqP/CFduTIvJbB8WowPGRBhvyFkp+ZhBddutt0=
+github.com/gitopia/gitopia-go v0.4.0 h1:vuKVlUDKqUlK6wz5n/Lbn6q0H7+4v0PzI1DBnxKFpbE=
+github.com/gitopia/gitopia-go v0.4.0/go.mod h1:1in+bQqP/CFduTIvJbB8WowPGRBhvyFkp+ZhBddutt0=
 github.com/gitopia/gitopia/v2 v2.0.1 h1:SeHwKkUkA+bqEzsgVimsOb5v6A1wL6O0zqQg/PSSl5c=
 github.com/gitopia/gitopia/v2 v2.0.1/go.mod h1:ZEEo2wHSxjJL3tcGg+ZenFlYMhfqFzwJkGkNMkgA9lE=
 github.com/gliderlabs/ssh v0.3.5 h1:OcaySEmAQJgyYcArR+gGGTHCyE7nvhEMTlYY+Dp8CpY=