From f742cfb0646269c66e5cdd0034bee5debc721bcb Mon Sep 17 00:00:00 2001 From: "go-git-renovate[bot]" <245267575+go-git-renovate[bot]@users.noreply.github.com> Date: Sat, 28 Mar 2026 07:44:23 +0000 Subject: [PATCH 1/2] build: Update github.com/go-git/go-git-fixtures/v5 digest to eda62fa --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index bcc9c6c..dcab4c1 100644 --- a/go.mod +++ b/go.mod @@ -5,8 +5,8 @@ go 1.24.0 toolchain go1.25.4 require ( - github.com/go-git/go-billy/v6 v6.0.0-20260114122816-19306b749ecc - github.com/go-git/go-git-fixtures/v5 v5.1.2-0.20260207212403-7b71b9a390be + github.com/go-git/go-billy/v6 v6.0.0-20260226131633-45bd0956d66f + github.com/go-git/go-git-fixtures/v5 v5.1.2-0.20260328065819-eda62fa02f83 github.com/go-git/go-git/v6 v6.0.0-20260114124804-a8db3a6585a6 github.com/spf13/cobra v1.10.2 golang.org/x/crypto v0.48.0 diff --git a/go.sum b/go.sum index 7f792af..c515da3 100644 --- a/go.sum +++ b/go.sum @@ -20,10 +20,10 @@ github.com/gliderlabs/ssh v0.3.8 h1:a4YXD1V7xMF9g5nTkdfnja3Sxy1PVDCj1Zg4Wb8vY6c= github.com/gliderlabs/ssh v0.3.8/go.mod h1:xYoytBv1sV0aL3CavoDuJIQNURXkkfPA/wxQ1pL1fAU= github.com/go-git/gcfg/v2 v2.0.2 h1:MY5SIIfTGGEMhdA7d7JePuVVxtKL7Hp+ApGDJAJ7dpo= github.com/go-git/gcfg/v2 v2.0.2/go.mod h1:/lv2NsxvhepuMrldsFilrgct6pxzpGdSRC13ydTLSLs= -github.com/go-git/go-billy/v6 v6.0.0-20260114122816-19306b749ecc h1:rhkjrnRkamkRC7woapp425E4CAH6RPcqsS9X8LA93IY= -github.com/go-git/go-billy/v6 v6.0.0-20260114122816-19306b749ecc/go.mod h1:X1oe0Z2qMsa9hkar3AAPuL9hu4Mi3ztXEjdqRhr6fcc= -github.com/go-git/go-git-fixtures/v5 v5.1.2-0.20260207212403-7b71b9a390be h1:99rlepX9pwoqZQ0AzdJLRPinQLZ9QdkOScfkhY/GHYA= -github.com/go-git/go-git-fixtures/v5 v5.1.2-0.20260207212403-7b71b9a390be/go.mod h1:xKt0pNHST9tYHvbiLxSY27CQWFwgIxBJuDrOE0JvbZw= +github.com/go-git/go-billy/v6 v6.0.0-20260226131633-45bd0956d66f h1:Uvbx7nITO3Sd1GdXarX0TbyYmOaSNIJP0mm4LocEyyA= +github.com/go-git/go-billy/v6 v6.0.0-20260226131633-45bd0956d66f/go.mod h1:ZW9JC5gionMP1kv5uiaOaV23q0FFmNrVOV8VW+y/acc= +github.com/go-git/go-git-fixtures/v5 v5.1.2-0.20260328065819-eda62fa02f83 h1:it9grfcwKdquCxdiX9YauP7FGZIhjA7X0a/Za36TqVs= +github.com/go-git/go-git-fixtures/v5 v5.1.2-0.20260328065819-eda62fa02f83/go.mod h1:YvXSvVfFPFrsP+e92xpajmPzlA7kPhhaLkwkve57UVk= github.com/go-git/go-git/v6 v6.0.0-20260114124804-a8db3a6585a6 h1:Yo1MlE8LpvD0pr7mZ04b6hKZKQcPvLrQFgyY1jNMEyU= github.com/go-git/go-git/v6 v6.0.0-20260114124804-a8db3a6585a6/go.mod h1:enMzPHv+9hL4B7tH7OJGQKNzCkMzXovUoaiXfsLF7Xs= github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 h1:f+oWsMOmNPc8JmEHVZIycC7hBoQxHH9pNKQORJNozsQ= From cf09893cc74c43de4784b7c89fc009683022a0ec Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 28 Mar 2026 08:45:44 +0000 Subject: [PATCH 2/2] fix: handle multiple return values from fixture.Idx() and fixture.Packfile() Agent-Logs-Url: https://github.com/go-git/cli/sessions/31fac60e-d44a-4401-ba4c-aede66625980 Co-authored-by: pjbgf <5452977+pjbgf@users.noreply.github.com> --- cmd/gogit/verify-pack.go | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/cmd/gogit/verify-pack.go b/cmd/gogit/verify-pack.go index 913ece8..2fbb172 100644 --- a/cmd/gogit/verify-pack.go +++ b/cmd/gogit/verify-pack.go @@ -165,7 +165,17 @@ func openPack(path string) (billy.File, billy.File, error) { fixture := f.One() - return fixture.Idx(), fixture.Packfile(), nil + idxFile, err := fixture.Idx() + if err != nil { + return nil, nil, fmt.Errorf("failed to open fixture index: %w", err) + } + + packFile, err := fixture.Packfile() + if err != nil { + return nil, nil, fmt.Errorf("failed to open fixture packfile: %w", err) + } + + return idxFile, packFile, nil } idxPath := path