github mirroring: use --follow-tags option when necessary.
Use --follow-tags option when mirroring to GitHub. This option is
turned off by default.
Needed for pushing version tags to madb GitHub repo.
Change-Id: I19629d7087587031698fb849a953d0acec0a45bf
MultiPart: 2/2
diff --git a/jiri-test/internal/test/github.go b/jiri-test/internal/test/github.go
index cb1d8fe..d4d7ded 100644
--- a/jiri-test/internal/test/github.go
+++ b/jiri-test/internal/test/github.go
@@ -93,6 +93,7 @@
name: "madb",
googlesource: "https://vanadium.googlesource.com/release.projects.madb",
github: "git@github.com:vanadium/madb.git",
+ followTags: true,
},
Mirror{
name: "manifest",
@@ -179,6 +180,7 @@
type Mirror struct {
name, googlesource, github string
+ followTags bool
}
// vanadiumGitHubMirror mirrors googlesource.com vanadium projects to
@@ -284,7 +286,7 @@
git := gitutil.New(jirix.NewSeq(), rootOpt)
// Fetch master branch from origin.
- if err := git.FetchRefspec("origin", "master"); err != nil {
+ if err := git.FetchRefspec("origin", "master", gitutil.TagsOpt(true)); err != nil {
return err
}
@@ -295,5 +297,5 @@
func push(jirix *jiri.X, mirror Mirror, projects string) error {
dirname := filepath.Join(projects, mirror.name)
opts := gitutil.RootDirOpt(dirname)
- return gitutil.New(jirix.NewSeq(), opts).Push(mirror.github, "master", gitutil.ForceOpt(true))
+ return gitutil.New(jirix.NewSeq(), opts).Push(mirror.github, "master", gitutil.ForceOpt(true), gitutil.FollowTagsOpt(mirror.followTags))
}