From 6b6ea3271fd4f0ed99d5390461db9fa45ce4c164 Mon Sep 17 00:00:00 2001 From: Andy Pan Date: Thu, 18 Mar 2021 10:45:04 +0800 Subject: [PATCH] cmd/go: use the global rooted path name Change-Id: I4a450af5f35f0ad4e4652789f1eda4d3171610e7 Reviewed-on: https://go-review.googlesource.com/c/go/+/302852 Run-TryBot: Jay Conrod TryBot-Result: Go Bot Reviewed-by: Jay Conrod Reviewed-by: Bryan C. Mills Trust: Jay Conrod --- src/cmd/go/internal/base/path.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/cmd/go/internal/base/path.go b/src/cmd/go/internal/base/path.go index 7a51181c97..cb4adbde42 100644 --- a/src/cmd/go/internal/base/path.go +++ b/src/cmd/go/internal/base/path.go @@ -32,10 +32,8 @@ func ShortPath(path string) string { // made relative to the current directory if they would be shorter. func RelPaths(paths []string) []string { var out []string - // TODO(rsc): Can this use Cwd from above? - pwd, _ := os.Getwd() for _, p := range paths { - rel, err := filepath.Rel(pwd, p) + rel, err := filepath.Rel(Cwd, p) if err == nil && len(rel) < len(p) { p = rel } -- 2.50.0