The cross-harness, self-improving memory layer for AI agents. Join our community: https://discord.com/invite/zdNChS2fBu
Go agent-ai-cliagent-harnessesagent-securitybrowser-extensionciclaude-codecloudcodexcursordetection-engineeringjevknowledge-basememorymobile-device-managementobservabilitysecuritysecurity-information-and-event-managementsecurity-toolstelemetrytraces
fix(gitlink): read commits correctly when log.showSignature is set (#1073)
Rudy Mizrahi Celekliedde3ea2f805
diff --git a/cli/beacon/internal/gitlink/commit_test.go b/cli/beacon/internal/gitlink/commit_test.gonew file mode 100644index 00000000..f5029377--- /dev/null+++ b/cli/beacon/internal/gitlink/commit_test.go@@ -0,0 +1,57 @@+package gitlink++import (+ "context"+ "os/exec"+ "path/filepath"+ "testing"+ "time"+)++// A user with log.showSignature set gets git's signature check printed ahead of --format output+// for every signed commit. Signing with an SSH key and no allowed-signers file makes git print+// "No signature" there, which is enough to show the output is not shifted.+func TestCommitReadsIgnoreLogShowSignature(t *testing.T) {+ r := newTestRepo(t)+ if _, err := exec.LookPath("ssh-keygen"); err != nil {+ t.Skip("ssh-keygen not installed")+ }+ key := filepath.Join(t.TempDir(), "key")+ if out, err := exec.Command("ssh-keygen", "-q", "-t", "ed25519", "-N", "", "-f", key).CombinedOutput(); err != nil {+ t.Skipf("ssh-keygen: %v\n%s", err, out)+ }+ r.git("config", "gpg.format", "ssh")+ r.git("config", "user.signingkey", key)+ r.git("config", "commit.gpgsign", "true")++ at := time.Date(2026, 3, 1, 12, 0, 0, 0, time.UTC)+ r.write("a.txt", "one\n")+ first := r.commitAt("first", at)+ r.write("a.txt", "two\n")+ second := r.commitAt("second", at.Add(time.Hour))+ r.git("config", "log.showSignature", "true")++ ctx := context.Background()+ repo := r.open()+ commit, err := ResolveCommit(ctx, repo.Git, "")+ if err != nil {+ t.Fatal(err)+ }+ if commit.SHA != second || commit.Subject != "second" || len(commit.Parents) != 1 || commit.Parents[0] != first {+ t.Fatalf("ResolveCommit = %+v, want sha %s subject second parent %s", commit, second, first)+ }+ if !commit.ParentTime.Equal(at) {+ t.Fatalf("ParentTime = %v, want %v", commit.ParentTime, at)+ }++ if changed, err := AddLinks(ctx, repo.Git, second, []Link{{Harness: "claude_code", SessionID: "s1"}}); err != nil || !changed {+ t.Fatalf("AddLinks = %v, %v", changed, err)+ }+ linked, err := ListLinked(ctx, repo.Git, "", 10)+ if err != nil {+ t.Fatal(err)+ }+ if len(linked) != 1 || linked[0].SHA != second || linked[0].Subject != "second" {+ t.Fatalf("ListLinked = %+v, want one commit %s", linked, second)+ }+}diff --git a/cli/beacon/internal/gitlink/git.go b/cli/beacon/internal/gitlink/git.goindex ea689713..a6f20639 100644--- a/cli/beacon/internal/gitlink/git.go+++ b/cli/beacon/internal/gitlink/git.go@@ -54,7 +54,8 @@ func (g Git) RunRaw(ctx context.Context, args ...string) ([]byte, error) {}func (g Git) run(ctx context.Context, stdin []byte, args ...string) ([]byte, error) {- full := append([]string{"-C", g.dir()}, args...)+ // log.showSignature would print each signed commit's verification ahead of --format output.+ full := append([]string{"-C", g.dir(), "-c", "log.showSignature=false"}, args...)cmd := exec.CommandContext(ctx, "git", full...)if g.Env != nil {cmd.Env = g.Envdiff --git a/cli/beacon/internal/gitlink/replay_signature_test.go b/cli/beacon/internal/gitlink/replay_signature_test.gonew file mode 100644index 00000000..82664043--- /dev/null+++ b/cli/beacon/internal/gitlink/replay_signature_test.go@@ -0,0 +1,32 @@+package gitlink++import (+ "context"+ "os/exec"+ "path/filepath"+ "testing"+)++func TestReplayDetectedWithLogShowSignature(t *testing.T) {+ r := newTestRepo(t)+ key := filepath.Join(t.TempDir(), "key")+ if out, err := exec.Command("ssh-keygen", "-q", "-t", "ed25519", "-N", "", "-f", key).CombinedOutput(); err != nil {+ t.Fatalf("ssh-keygen: %v\n%s", err, out)+ }+ r.git("config", "gpg.format", "ssh")+ r.git("config", "user.signingkey", key)+ r.git("config", "commit.gpgsign", "true")+ ctx := context.Background()+ repo := r.open()+ r.write("f", "base\n")+ r.commitAt("base", t0)+ r.git("checkout", "-q", "-b", "side")+ r.write("s1", "1")+ r.commitAt("side1", t0)+ r.git("checkout", "-q", "main")+ r.git("config", "log.showSignature", "true")+ r.git("cherry-pick", "side")+ if !ReplayInProgress(ctx, repo) {+ t.Errorf("clean signed cherry-pick with log.showSignature: replay=false; reflog %q", r.git("reflog", "-1", "--format=%gs", "HEAD"))+ }+}