tjh.dev
forked from
tangled.org/core
Mirror of @tangled.org/core. Running on a Raspberry Pi Zero 2 (Please be gentle).
knotserver: git: fix hiddenRef logic
anirudh.fi
+5
-2
+5
-2
knotserver/git/fork.go
+5
-2
knotserver/git/fork.go
···
1
1
package git
2
2
3
3
import (
4
+
"errors"
4
5
"fmt"
5
6
"os/exec"
6
7
···
35
34
func (g *GitRepo) TrackHiddenRemoteRef(forkRef, remoteRef string) error {
36
35
fetchOpts := &git.FetchOptions{
37
36
RefSpecs: []config.RefSpec{
38
-
config.RefSpec(fmt.Sprintf("+refs/heads/%s:refs/hidden/%s/%s", forkRef, forkRef, remoteRef)),
37
+
config.RefSpec(fmt.Sprintf("+refs/heads/%s:refs/hidden/%s/%s", remoteRef, forkRef, remoteRef)),
39
38
},
40
39
RemoteName: "origin",
41
40
}
42
41
43
42
err := g.r.Fetch(fetchOpts)
44
-
if err != nil {
43
+
if errors.Is(git.NoErrAlreadyUpToDate, err) {
44
+
return nil
45
+
} else if err != nil {
45
46
return fmt.Errorf("failed to fetch hidden remote: %s: %w", forkRef, err)
46
47
}
47
48
return nil