Adjust temporary Git tags to also include namespace (and to normalize just in case something that can't be in a Git tag slips through)

tianon · tianon · commit 9d55b441fbbb · 2019-06-15T06:45:18.000-07:00
diff --git a/go/src/bashbrew/git.go b/go/src/bashbrew/git.go
@@ -242,7 +242,7 @@ func (r Repo) fetchGitRepo(arch string, entry *manifest.Manifest2822Entry) (stri
 		return "", err
 	}
 
-	gitTag := arch+"/"+r.RepoName+"/"+entry.Tags[0]
+	gitTag := gitNormalizeForTagUsage(path.Join(arch, namespace, r.RepoName, entry.Tags[0]))
 	gitRepo.DeleteTag(gitTag) // avoid "ErrTagExists"
 	_, err = gitRepo.CreateTag(gitTag, goGitPlumbing.NewHash(commit), nil)
 	if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -242,7 +242,7 @@ func (r Repo) fetchGitRepo(arch string, entry *manifest.Manifest2822Entry) (stri`
`242`	`242`	`return "", err`
`243`	`243`	`}`
`244`	`244`
`245`		`- gitTag := arch+"/"+r.RepoName+"/"+entry.Tags[0]`
	`245`	`+ gitTag := gitNormalizeForTagUsage(path.Join(arch, namespace, r.RepoName, entry.Tags[0]))`
`246`	`246`	`gitRepo.DeleteTag(gitTag) // avoid "ErrTagExists"`
`247`	`247`	`_, err = gitRepo.CreateTag(gitTag, goGitPlumbing.NewHash(commit), nil)`
`248`	`248`	`if err != nil {`