Monorepo for Tangled tangled.org
820
fork

Configure Feed

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

knotserver: calculate old/new SHAs in merge #20

open opened by oppi.li targeting master from op/lqvzlsltozms
Labels

None yet.

assignee

None yet.

Participants 1
AT URI
at://did:plc:qfpnj4og54vl56wngdriaxug/sh.tangled.repo.pull/3mki6u6e7wq22
+8 -2
Diff #0
+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)

History

2 rounds 0 comments
sign up or login to add to the discussion
1 commit
expand
knotserver: calculate old/new SHAs in merge
merge conflicts detected
expand
  • knotserver/git/git.go:82
  • knotserver/xrpc/merge.go:110
expand 0 comments
oppi.li submitted #0
1 commit
expand
knotserver: calculate old/new SHAs in merge
expand 0 comments