close_issue_2
/
tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmd/go-contrib-init: don't assume user is in root directory of git checkout 

Updates golang/go#17802

Change-Id: I8eeae42f395dee4eedd17114f10bb56536783089
Reviewed-on: https://go-review.googlesource.com/45082
Reviewed-by: Steve Francia <spf@golang.org>
This commit is contained in:
Brad Fitzpatrick 2017-06-07 23:28:22 +00:00
parent 154c88c09d
commit 16c483b02b
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cmd/go-contrib-init/contrib.go
View File

@ -94,15 +94,16 @@ func checkGitOrigin() {
if _, err := exec.LookPath("git"); err != nil { if _, err := exec.LookPath("git"); err != nil {
log.Fatalf("You don't appear to have git installed. Do that.") log.Fatalf("You don't appear to have git installed. Do that.")
} }
if _, err := os.Stat(".git"); err != nil { wantRemote := "https://go.googlesource.com/" + *repo
log.Fatalf("You are not currently in a git checkout of https://go.googlesource.com/%s", *repo)
}
remotes, err := exec.Command("git", "remote", "-v").Output() remotes, err := exec.Command("git", "remote", "-v").Output()
if err != nil { if err != nil {
log.Fatalf("Error running git remote -v: %v", cmdErr(err)) msg := cmdErr(err)
if strings.Contains(msg, "Not a git repository") {
log.Fatalf("Your current directory is not in a git checkout of %s", wantRemote)
}
log.Fatalf("Error running git remote -v: %v", msg)
} }
matches := 0 matches := 0
wantRemote := "https://go.googlesource.com/" + *repo
for _, line := range strings.Split(string(remotes), "\n") { for _, line := range strings.Split(string(remotes), "\n") {
line = strings.TrimSpace(line) line = strings.TrimSpace(line)
if !strings.HasPrefix(line, "origin") { if !strings.HasPrefix(line, "origin") {