From 19a0c4cb4d497ad93753cd80d636615f2fbe6725 Mon Sep 17 00:00:00 2001 From: oppiliappan Date: Wed, 16 Jul 2025 10:59:48 +0100 Subject: [PATCH] knotserver/git: refactor FindMainBranch to use `git rev-parse` Change-Id: olwrkvnzsnztswurxtxywzwtwlommrlu Signed-off-by: oppiliappan --- knotserver/git/git.go | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/knotserver/git/git.go b/knotserver/git/git.go index 77bd1b3..154f519 100644 --- a/knotserver/git/git.go +++ b/knotserver/git/git.go @@ -316,15 +316,12 @@ func (g *GitRepo) SetDefaultBranch(branch string) error { } func (g *GitRepo) FindMainBranch() (string, error) { - ref, err := g.r.Head() + output, err := g.revParse("--abbrev-ref", "HEAD") if err != nil { - return "", fmt.Errorf("unable to find main branch: %w", err) - } - if ref.Name().IsBranch() { - return strings.TrimPrefix(string(ref.Name()), "refs/heads/"), nil + return "", fmt.Errorf("failed to find main branch: %w", err) } - return "", fmt.Errorf("unable to find main branch: %w", err) + return strings.TrimSpace(string(output)), nil } // WriteTar writes itself from a tree into a binary tar file format. -- 2.43.0