[tailscale1.18] cmd/dist: stamp git commit into runtime.Version value

josharian · josharian · commit f52db1c50903 · 2022-02-07T15:00:24.000-08:00
Temporary fix until golang#37475 is done. (cherry picked from commit ba89304) Change-Id: I204f03bc62c6f2295a8bc66d3f0bb2132153bc27
diff --git a/src/cmd/dist/build.go b/src/cmd/dist/build.go
@@ -377,6 +377,9 @@ func findgoversion() string {
 					b = "builder " + hostType
 				}
 			}
+			if isGitRepo() {
+				b += "-ts" + chomp(run(goroot, CheckExit, "git", "log", "-n", "1", "--format=format:%h", "HEAD"))
+			}
 			return b
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -377,6 +377,9 @@ func findgoversion() string {`
`377`	`377`	`b = "builder " + hostType`
`378`	`378`	`}`
`379`	`379`	`}`
	`380`	`+ if isGitRepo() {`
	`381`	`+ b += "-ts" + chomp(run(goroot, CheckExit, "git", "log", "-n", "1", "--format=format:%h", "HEAD"))`
	`382`	`+ }`
`380`	`383`	`return b`
`381`	`384`	`}`
`382`	`385`	`}`