cmd/go: keep "go help" in unknown topic suggestion

jmartin82 · Bryan C. Mills · commit 68e28998d7f0 · 2019-07-23T20:39:43.000Z
Fixed missing concatenation to build the suggested command. Fixes #33153 Change-Id: I26c02f2966247aa07d1447b8ec1a2203046842dd GitHub-Last-Rev: 9631abf GitHub-Pull-Request: #33245 Reviewed-on: https://go-review.googlesource.com/c/go/+/187217 Reviewed-by: Bryan C. Mills <bcmills@google.com> Run-TryBot: Bryan C. Mills <bcmills@google.com> TryBot-Result: Gobot Gobot <gobot@golang.org>
diff --git a/src/cmd/go/internal/help/help.go b/src/cmd/go/internal/help/help.go
@@ -63,7 +63,7 @@ Args:
 		// helpSuccess is the help command using as many args as possible that would succeed.
 		helpSuccess := "go help"
 		if i > 0 {
-			helpSuccess = " " + strings.Join(args[:i], " ")
+			helpSuccess += " " + strings.Join(args[:i], " ")
 		}
 		fmt.Fprintf(os.Stderr, "go help %s: unknown help topic. Run '%s'.\n", strings.Join(args, " "), helpSuccess)
 		base.SetExitStatus(2) // failed at 'go help cmd'

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ Args:`
`63`	`63`	`// helpSuccess is the help command using as many args as possible that would succeed.`
`64`	`64`	`helpSuccess := "go help"`
`65`	`65`	`if i > 0 {`
`66`		`- helpSuccess = " " + strings.Join(args[:i], " ")`
	`66`	`+ helpSuccess += " " + strings.Join(args[:i], " ")`
`67`	`67`	`}`
`68`	`68`	`fmt.Fprintf(os.Stderr, "go help %s: unknown help topic. Run '%s'.\n", strings.Join(args, " "), helpSuccess)`
`69`	`69`	`base.SetExitStatus(2) // failed at 'go help cmd'`