Skip to content

Commit

Permalink
[release-branch.go1.18] cmd/go: fix buildvcs when using older git ver…
Browse files Browse the repository at this point in the history
…sions

Git versions before v2.10.0 do not support --no-show-signature.
Using "-c" allows Git to ignore the configuration option if it does not
exist.

Fixes #51253

Change-Id: I2b1adaca0eb18ae31f2e1119e354ce515b00cfc2
Reviewed-on: https://go-review.googlesource.com/c/go/+/388194
Trust: Dmitri Shuralyov <dmitshur@golang.org>
Run-TryBot: Dmitri Shuralyov <dmitshur@golang.org>
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Bryan Mills <bcmills@google.com>
(cherry picked from commit 7026eeb)
Reviewed-on: https://go-review.googlesource.com/c/go/+/391354
  • Loading branch information
mpx authored and dmitshur committed Mar 10, 2022
1 parent d10b819 commit 1e4dc06
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/cmd/go/internal/vcs/vcs.go
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ func gitStatus(vcsGit *Cmd, rootDir string) (Status, error) {
// uncommitted files and skip tagging revision / committime.
var rev string
var commitTime time.Time
out, err = vcsGit.runOutputVerboseOnly(rootDir, "show -s --no-show-signature --format=%H:%ct")
out, err = vcsGit.runOutputVerboseOnly(rootDir, "-c log.showsignature=false show -s --format=%H:%ct")
if err != nil && !uncommitted {
return Status{}, err
} else if err == nil {
Expand Down
2 changes: 1 addition & 1 deletion src/cmd/go/testdata/script/version_buildvcs_git.txt
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ rm $GOBIN/d$GOEXE
go list -x ./...
stdout -count=3 '^example.com'
stderr -count=1 '^git status'
stderr -count=1 '^git show'
stderr -count=1 '^git -c log.showsignature=false show'

-- $WORK/fakebin/git --
#!/bin/sh
Expand Down

0 comments on commit 1e4dc06

Please sign in to comment.