pkg/git: Include commit message and URL in error

go-git: Include the commit message in the returned commit object. libgit2: Set the URL in the checkout error. Signed-off-by: Sunny <[email protected]>
fluxcd · Feb 14, 2022 · a7fac8c · a7fac8c
1 parent af0226b
commit a7fac8c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/pkg/git/gogit/checkout.go b/pkg/git/gogit/checkout.go
@@ -315,6 +315,7 @@ func buildCommitWithRef(c *object.Commit, ref plumbing.ReferenceName) (*git.Comm
  Committer: buildSignature(c.Committer),
  Signature: c.PGPSignature,
  Encoded: b,
+ Message: c.Message,
  }, nil
 }
 

diff --git a/pkg/git/libgit2/checkout.go b/pkg/git/libgit2/checkout.go
@@ -69,7 +69,7 @@ func (c *CheckoutBranch) Checkout(ctx context.Context, path, url string, opts *g
  CheckoutBranch: c.Branch,
  })
  if err != nil {
- return nil, fmt.Errorf("unable to clone: %w", gitutil.LibGit2Error(err))
+ return nil, fmt.Errorf("unable to clone '%s': %w", url, gitutil.LibGit2Error(err))
  }
  defer repo.Free()
  head, err := repo.Head()