forked from tangled.org/core
Monorepo for Tangled — https://tangled.org

knotserver: git: fix hiddenRef logic

anirudh.fi d6b7f6e6 5959c27f

verified
Changed files
+5 -2
knotserver
git
+5 -2
knotserver/git/fork.go
···
package git
import (
+
"errors"
"fmt"
"os/exec"
···
func (g *GitRepo) TrackHiddenRemoteRef(forkRef, remoteRef string) error {
fetchOpts := &git.FetchOptions{
RefSpecs: []config.RefSpec{
-
config.RefSpec(fmt.Sprintf("+refs/heads/%s:refs/hidden/%s/%s", forkRef, forkRef, remoteRef)),
+
config.RefSpec(fmt.Sprintf("+refs/heads/%s:refs/hidden/%s/%s", remoteRef, forkRef, remoteRef)),
},
RemoteName: "origin",
}
err := g.r.Fetch(fetchOpts)
-
if err != nil {
+
if errors.Is(git.NoErrAlreadyUpToDate, err) {
+
return nil
+
} else if err != nil {
return fmt.Errorf("failed to fetch hidden remote: %s: %w", forkRef, err)
}
return nil