From 06bd1ce043893c21c115989f5d548c46a4305857 Mon Sep 17 00:00:00 2001 From: oppiliappan Date: Mon, 27 Apr 2026 15:28:27 +0100 Subject: [PATCH] knotserver: remove `--allow-empty` from `git am` Signed-off-by: oppiliappan --- knotserver/git/merge.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/knotserver/git/merge.go b/knotserver/git/merge.go index 8945e63a..92864445 100644 --- a/knotserver/git/merge.go +++ b/knotserver/git/merge.go @@ -237,7 +237,7 @@ func (g *GitRepo) applySingleMailbox(singlePatch types.FormatPatch) (plumbing.Ha } var stderr bytes.Buffer - cmd := exec.Command("git", "-C", g.path, "am", "--allow-empty", tmpPatch) + cmd := exec.Command("git", "-C", g.path, "am", tmpPatch) cmd.Stderr = &stderr head, err := g.r.Head() -- 2.51.2