From 5075cefac7cfe770c2d5117832f688a9e660e79c Mon Sep 17 00:00:00 2001 From: oppiliappan Date: Mon, 27 Apr 2026 13:34:28 +0000 Subject: [PATCH] knotserver: calculate old/new SHAs in merge Signed-off-by: oppiliappan --- knotserver/git/git.go | 2 +- knotserver/xrpc/merge.go | 10 ++++++++-- 2 file(s) changed, 9 insertion(s)(+), 3 deletion(s)(-) diff --git a/knotserver/git/git.go b/knotserver/git/git.go --- a/knotserver/git/git.go +++ b/knotserver/git/git.go @@ -82,7 +82,7 @@ } // re-open a repository and update references func (g *GitRepo) Refresh() error { - refreshed, err := PlainOpen(g.path) + refreshed, err := Open(g.path, g.Hash().String()) if err != nil { return err } diff --git a/knotserver/xrpc/merge.go b/knotserver/xrpc/merge.go --- a/knotserver/xrpc/merge.go +++ b/knotserver/xrpc/merge.go @@ -110,14 +110,20 @@ return } } + oldSha := gr.Hash() + if err := gr.Refresh(); err != nil { + l.Error("failed to refresh", "error", err) + } + newSha := gr.Hash() + go func() { refUpdate := tangled.GitRefUpdate{ RepoDid: &repoDid, OwnerDid: &data.Did, RepoName: data.Name, Ref: data.Branch, - OldSha: "", // TODO: fill this - NewSha: "", // TODO: fill this + OldSha: oldSha.String(), + NewSha: newSha.String(), CommitterDid: actorDid.String(), } eventJson, err := json.Marshal(refUpdate) -- tangled.sh