zoekt-mirror-gerrit: fix fetch for meta/config (#777)

xavier-calland · web-flow · commit 9f35cb185def · 2024-05-06T14:56:06.000+02:00
The current configuration creates a conflict with default
fetch config `+refs/heads/*:refs/heads/*`.

The first fetch is ok but once a local "refs/heads/meta/config" exists
fetch fails because 2 fetch rules match for local "refs/heads/meta/config" :
"refs/meta/config" and "refs/heads/meta/config"

Changing local ref name fixes the problem
diff --git a/cmd/zoekt-mirror-gerrit/main.go b/cmd/zoekt-mirror-gerrit/main.go
@@ -285,7 +285,7 @@ func addMetaConfigFetch(repoDir string) error {
 
 	rm := cfg.Remotes["origin"]
 	if rm != nil {
-		configRefSpec := config.RefSpec("+refs/meta/config:refs/heads/meta/config")
+		configRefSpec := config.RefSpec("+refs/meta/config:refs/heads/meta-config")
 		if !slices.Contains(rm.Fetch, configRefSpec) {
 			rm.Fetch = append(rm.Fetch, configRefSpec)
 		}

Original file line number	Diff line number	Diff line change
`@@ -285,7 +285,7 @@ func addMetaConfigFetch(repoDir string) error {`
`285`	`285`
`286`	`286`	`rm := cfg.Remotes["origin"]`
`287`	`287`	`if rm != nil {`
`288`		`- configRefSpec := config.RefSpec("+refs/meta/config:refs/heads/meta/config")`
	`288`	`+ configRefSpec := config.RefSpec("+refs/meta/config:refs/heads/meta-config")`
`289`	`289`	`if !slices.Contains(rm.Fetch, configRefSpec) {`
`290`	`290`	`rm.Fetch = append(rm.Fetch, configRefSpec)`
`291`	`291`	`}`