tangled.org / core
Monorepo for Tangled tangled.org
761
fork

Configure Feed

Select the types of activity you want to include in your feed.

knotserver: calculate old/new SHAs in merge

Signed-off-by: oppiliappan <me@oppi.li>

authored by

oppiliappan and committed by
Tangled 5075cefa 120cf31d

+9 -3
+1 -1
knotserver/git/git.go
··· 82 82 83 83 // re-open a repository and update references 84 84 func (g *GitRepo) Refresh() error { 85 - refreshed, err := PlainOpen(g.path) 85 + refreshed, err := Open(g.path, g.Hash().String()) 86 86 if err != nil { 87 87 return err 88 88 }
+8 -2
knotserver/xrpc/merge.go
··· 110 110 } 111 111 } 112 112 113 + oldSha := gr.Hash() 114 + if err := gr.Refresh(); err != nil { 115 + l.Error("failed to refresh", "error", err) 116 + } 117 + newSha := gr.Hash() 118 + 113 119 go func() { 114 120 refUpdate := tangled.GitRefUpdate{ 115 121 RepoDid: &repoDid, 116 122 OwnerDid: &data.Did, 117 123 RepoName: data.Name, 118 124 Ref: data.Branch, 119 - OldSha: "", // TODO: fill this 120 - NewSha: "", // TODO: fill this 125 + OldSha: oldSha.String(), 126 + NewSha: newSha.String(), 121 127 CommitterDid: actorDid.String(), 122 128 } 123 129 eventJson, err := json.Marshal(refUpdate)