diff --git a/patches/0002-Restore-GOPATH-mode-get.patch b/patches/0002-Restore-GOPATH-mode-get.patch index e31ac0fb..2d0610d9 100644 --- a/patches/0002-Restore-GOPATH-mode-get.patch +++ b/patches/0002-Restore-GOPATH-mode-get.patch @@ -748,8 +748,8 @@ index 0000000..16175a2 + + if p.Internal.Build.SrcRoot != "" { + // Directory exists. Look for checkout along path to src. -+ const allowNesting = false -+ repoDir, vcsCmd, err = vcs.FromDir(p.Dir, p.Internal.Build.SrcRoot, allowNesting) ++ ++ repoDir, vcsCmd, err = vcs.FromDir(p.Dir, p.Internal.Build.SrcRoot) + if err != nil { + return err + } diff --git a/src/cmd/go/internal/get/get.go b/src/cmd/go/internal/get/get.go index 16175a27..d40cc55b 100644 --- a/src/cmd/go/internal/get/get.go +++ b/src/cmd/go/internal/get/get.go @@ -451,8 +451,8 @@ func downloadPackage(p *load.Package) error { if p.Internal.Build.SrcRoot != "" { // Directory exists. Look for checkout along path to src. - const allowNesting = false - repoDir, vcsCmd, err = vcs.FromDir(p.Dir, p.Internal.Build.SrcRoot, allowNesting) + + repoDir, vcsCmd, err = vcs.FromDir(p.Dir, p.Internal.Build.SrcRoot) if err != nil { return err }