[release-branch.go1.21] cmd/go: set global .gitconfig location more robustly in tests

Also confirm that setting the location actually worked before
proceeding with the rest of the test.

This fixes a test failure with git versions older than 2.32.0.

For #53955.
For #64603.
Fixes #64586

Change-Id: I1a954975a3d8300e8b4dca045d3a15438a0407ec
Reviewed-on: https://go-review.googlesource.com/c/go/+/548215
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Russ Cox <rsc@golang.org>
Reviewed-by: Michael Matloob <matloob@golang.org>
Run-TryBot: Bryan Mills <bcmills@google.com>
Reviewed-on: https://go-review.googlesource.com/c/go/+/585816
Reviewed-by: Sam Thanawalla <samthanawalla@google.com>
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
Auto-Submit: Dmitri Shuralyov <dmitshur@google.com>
TryBot-Bypass: Dmitri Shuralyov <dmitshur@golang.org>
This commit is contained in:
Bryan C. Mills 2023-12-07 10:24:55 -05:00 committed by Gopher Robot
parent a6023db835
commit e9f3c9b7cd
5 changed files with 62 additions and 17 deletions

View File

@ -7,7 +7,16 @@
[!git] skip
[!net:github.com] skip 'does not actually use github.com because of insteadOf, but silence network check just in case'
env GIT_CONFIG_GLOBAL=$WORK/.gitconfig
# Redirect git to a test-specific .gitconfig.
# GIT_CONFIG_GLOBAL suffices for git 2.32.0 and newer.
# For older git versions we also set $HOME.
env GIT_CONFIG_GLOBAL=$WORK${/}home${/}gopher${/}.gitconfig
env HOME=$WORK${/}home${/}gopher
exec git config --global --show-origin user.name
stdout 'Go Gopher'
# Inject a local repo in place of a remote one, so that we can
# add commits to the repo partway through the test.
env GIT_ALLOW_PROTOCOL=file
env GOPRIVATE=github.com/golang/issue53955
@ -64,4 +73,7 @@ package issue53955
module m
go 1.18
-- $WORK/.gitconfig --
-- $WORK/home/gopher/.gitconfig --
[user]
name = Go Gopher
email = gopher@golang.org

View File

@ -1,8 +1,14 @@
[short] skip
[!git] skip
[!GOOS:linux] skip # Uses XDG_CONFIG_HOME
env GIT_CONFIG_GLOBAL=$WORK/.gitconfig
# Redirect git to a test-specific .gitconfig.
# GIT_CONFIG_GLOBAL suffices for git 2.32.0 and newer.
# For older git versions we also set $HOME.
env GIT_CONFIG_GLOBAL=$WORK${/}home${/}gopher${/}.gitconfig
env HOME=$WORK${/}home${/}gopher
exec git config --global --show-origin user.name
stdout 'Go Gopher'
env GOPRIVATE=vcs-test.golang.org
go mod download -x
@ -14,6 +20,9 @@ go 1.18
require vcs-test.golang.org/git/gitrepo1.git v1.2.3
-- $WORK/.gitconfig --
-- $WORK/home/gopher/.gitconfig --
[user]
name = Go Gopher
email = gopher@golang.org
[safe]
bareRepository = explicit
bareRepository = explicit

View File

@ -3,12 +3,15 @@ env GO111MODULE=on
[short] skip
[!git] skip
# Redirect git to a test-specific .gitconfig.
# GIT_CONFIG_GLOBAL suffices for git 2.32.0 and newer.
# For older git versions we also set $HOME.
env GIT_CONFIG_GLOBAL=$WORK${/}home${/}gopher${/}.gitconfig
env HOME=$WORK${/}home${/}gopher
exec git config --global --show-origin user.name
stdout 'Go Gopher'
env GOPROXY=direct
env HOME=$WORK/home/gopher
go env GOPROXY
stdout 'direct'
exec git config --get log.decorate
stdout 'full'
@ -24,5 +27,8 @@ go list -m vcs-test.golang.org/git/gitrepo1.git@v1.2.3
stdout 'vcs-test.golang.org/git/gitrepo1.git v1.2.3'
-- $WORK/home/gopher/.gitconfig --
[user]
name = Go Gopher
email = gopher@golang.org
[log]
decorate = full

View File

@ -1,8 +1,14 @@
[!net:github.com] skip
[!git] skip
[!GOOS:linux] skip # Uses XDG_CONFIG_HOME
env GIT_CONFIG_GLOBAL=$WORK/.gitconfig
# Redirect git to a test-specific .gitconfig.
# GIT_CONFIG_GLOBAL suffices for git 2.32.0 and newer.
# For older git versions we also set $HOME.
env GIT_CONFIG_GLOBAL=$WORK${/}home${/}gopher${/}.gitconfig
env HOME=$WORK${/}home${/}gopher
exec git config --global --show-origin user.name
stdout 'Go Gopher'
env GOPROXY=direct
! go mod download
@ -15,6 +21,9 @@ go 1.18
require github.com/golang/notexist/subdir v0.1.0
-- $WORK/.gitconfig --
-- $WORK/home/gopher/.gitconfig --
[user]
name = Go Gopher
email = gopher@golang.org
[url "git@github.com:"]
insteadOf = https://github.com/

View File

@ -5,6 +5,14 @@ env GO111MODULE=on
[!git] skip
env GOPROXY=direct
# Redirect git to a test-specific .gitconfig.
# GIT_CONFIG_GLOBAL suffices for git 2.32.0 and newer.
# For older git versions we also set $HOME.
env GIT_CONFIG_GLOBAL=$WORK${/}home${/}gopher${/}.gitconfig
env HOME=$WORK${/}home${/}gopher
exec git config --global --show-origin user.name
stdout 'Go Gopher'
! go mod download github.com/golang/nonexist@latest
stderr 'Confirm the import path was entered correctly.'
stderr 'If this is a private repository, see https://golang.org/doc/faq#git_https for additional information.'
@ -27,7 +35,7 @@ stderr '^If this is a private repository, see https://golang.org/doc/faq#git_htt
# Test that Git clone errors will be shown to the user instead of a generic
# "unknown revision" error. To do this we want to force git ls-remote to return
# an error we don't already have special handling for. See golang/go#42751.
env HOME=$WORK${/}home${/}gopher
exec git config --global url.git@github.com.insteadOf https://github.com/
env GIT_SSH_COMMAND=false
! go install github.com/golang/nonexist@master
stderr 'fatal: Could not read from remote repository.'
@ -35,5 +43,6 @@ stderr 'fatal: Could not read from remote repository.'
! stdout .
-- $WORK/home/gopher/.gitconfig --
[url "git@github.com:"]
insteadOf = https://github.com/
[user]
name = Go Gopher
email = gopher@golang.org