mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
builder/remotecontext/git: allow building on go1.18
cmd.Environ() is new in go1.19, and not needed for this specific case. Without this, trying to use this package in code that uses go1.18 will fail; builder/remotecontext/git/gitutils.go:216:23: cmd.Environ undefined (type *exec.Cmd has no field or method Environ) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
parent
43b8dffb83
commit
4fdc1bb1fb
1 changed files with 1 additions and 1 deletions
|
@ -213,7 +213,7 @@ func (repo gitRepo) gitWithinDir(dir string, args ...string) ([]byte, error) {
|
|||
cmd := exec.Command("git", args...)
|
||||
cmd.Dir = dir
|
||||
// Disable unsafe remote protocols.
|
||||
cmd.Env = append(cmd.Environ(), "GIT_PROTOCOL_FROM_USER=0")
|
||||
cmd.Env = append(os.Environ(), "GIT_PROTOCOL_FROM_USER=0")
|
||||
|
||||
if repo.isolateConfig {
|
||||
cmd.Env = append(cmd.Env,
|
||||
|
|
Loading…
Reference in a new issue