eti.tf / core-2
forked from tangled.org/core
Monorepo for Tangled
0
fork

Configure Feed

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

knotserver: fix refresh in merge-check contexts

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

oppiliappan c1b5c0b3 f1041580

+3 -1
+3 -1
knotserver/git/merge.go
··· 256 256 } 257 257 } 258 258 259 - if err := g.Refresh(); err != nil { 259 + refreshed, err := PlainOpen(g.path) 260 + if err != nil { 260 261 return plumbing.ZeroHash, fmt.Errorf("failed to refresh repository state: %w", err) 261 262 } 263 + *g = *refreshed 262 264 263 265 head, err = g.r.Head() 264 266 if err != nil {