also report branch in dev version

This commit is contained in:
matt wilkie
2025-11-16 18:10:46 -07:00
parent 6d390f7728
commit 12dfa0b555

View File

@@ -3,7 +3,9 @@ package main
import ( import (
"fmt" "fmt"
"os" "os"
"os/exec"
"runtime/debug" "runtime/debug"
"strings"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/steveyegge/beads/internal/beads" "github.com/steveyegge/beads/internal/beads"
@@ -15,8 +17,9 @@ var (
Version = "0.23.1" Version = "0.23.1"
// Build can be set via ldflags at compile time // Build can be set via ldflags at compile time
Build = "dev" Build = "dev"
// Commit is the git revision the binary was built from (optional ldflag) // Commit and branch the git revision the binary was built from (optional ldflag)
Commit = "" Commit = ""
Branch = ""
) )
var versionCmd = &cobra.Command{ var versionCmd = &cobra.Command{
@@ -31,6 +34,7 @@ var versionCmd = &cobra.Command{
} }
commit := resolveCommitHash() commit := resolveCommitHash()
branch := resolveBranch()
if jsonOutput { if jsonOutput {
result := map[string]string{ result := map[string]string{
@@ -40,10 +44,15 @@ var versionCmd = &cobra.Command{
if commit != "" { if commit != "" {
result["commit"] = commit result["commit"] = commit
} }
if branch != "" {
result["branch"] = branch
}
outputJSON(result) outputJSON(result)
} else { } else {
if commit != "" { if commit != "" && branch != "" {
fmt.Printf("bd version %s (%s, commit %s)\n", Version, Build, shortCommit(commit)) fmt.Printf("bd version %s (%s: %s@%s)\n", Version, Build, branch, shortCommit(commit))
} else if commit != "" {
fmt.Printf("bd version %s (%s: %s)\n", Version, Build, shortCommit(commit))
} else { } else {
fmt.Printf("bd version %s (%s)\n", Version, Build) fmt.Printf("bd version %s (%s)\n", Version, Build)
} }
@@ -126,3 +135,29 @@ func shortCommit(hash string) string {
} }
return hash return hash
} }
func resolveBranch() string {
if Branch != "" {
return Branch
}
// Try to get branch from build info (build-time VCS detection)
if info, ok := debug.ReadBuildInfo(); ok {
for _, setting := range info.Settings {
if setting.Key == "vcs.branch" && setting.Value != "" {
return setting.Value
}
}
}
// Fallback: try to get branch from git at runtime
cmd := exec.Command("git", "rev-parse", "--abbrev-ref", "HEAD")
cmd.Dir = "."
if output, err := cmd.Output(); err == nil {
if branch := strings.TrimSpace(string(output)); branch != "" && branch != "HEAD" {
return branch
}
}
return ""
}