diff --git a/src/cmd/go/discovery.go b/src/cmd/go/discovery.go index 4d1df2f472..f6992e9e93 100644 --- a/src/cmd/go/discovery.go +++ b/src/cmd/go/discovery.go @@ -43,7 +43,7 @@ func parseMetaGoImports(r io.Reader) (imports []metaImport, err error) { for { t, err = d.RawToken() if err != nil { - if err == io.EOF { + if err == io.EOF || len(imports) > 0 { err = nil } return diff --git a/src/cmd/go/pkg_test.go b/src/cmd/go/pkg_test.go index 23c2e08da1..90a92582e7 100644 --- a/src/cmd/go/pkg_test.go +++ b/src/cmd/go/pkg_test.go @@ -57,6 +57,15 @@ var parseMetaGoImportsTests = []struct { `, []metaImport{{"foo/bar", "git", "https://github.com/rsc/foo/bar"}}, }, + { + ``, + []metaImport{{"foo/bar", "git", "https://github.com/rsc/foo/bar"}}, + }, + { + // XML doesn't like
. + `Page Not Found
DRAFT
`, + []metaImport{{"chitin.io/chitin", "git", "https://github.com/chitin-io/chitin"}}, + }, } func TestParseMetaGoImports(t *testing.T) {