From c1b5c0b37eec96eec19c50ac3c2fcad688413c56 Mon Sep 17 00:00:00 2001 From: oppiliappan Date: Wed, 29 Apr 2026 09:13:46 +0100 Subject: [PATCH] knotserver: fix refresh in merge-check contexts Signed-off-by: oppiliappan --- knotserver/git/merge.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/knotserver/git/merge.go b/knotserver/git/merge.go index 92864445..0fb5effc 100644 --- a/knotserver/git/merge.go +++ b/knotserver/git/merge.go @@ -256,9 +256,11 @@ func (g *GitRepo) applySingleMailbox(singlePatch types.FormatPatch) (plumbing.Ha } } - if err := g.Refresh(); err != nil { + refreshed, err := PlainOpen(g.path) + if err != nil { return plumbing.ZeroHash, fmt.Errorf("failed to refresh repository state: %w", err) } + *g = *refreshed head, err = g.r.Head() if err != nil { -- 2.51.2