Skip to content

fix(cli attestation): handle non-merged branches #451

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Dec 1, 2023
Merged

fix(cli attestation): handle non-merged branches #451

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ce58295
fix(cli attestation): handle non-merged branches
migmartri Dec 1, 2023
91d7ee0
fix(cli attestation): handle non-merged branches
migmartri Dec 1, 2023
22fed7f
fix(cli attestation): handle non-merged branches
migmartri Dec 1, 2023
40b140a
fix(cli attestation): handle non-merged branches
migmartri Dec 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions internal/attestation/crafter/crafter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,9 @@ type CommitRemote struct {
Name, URL string
}

// This error is not exposed by go-git
var errBranchInvalidMerge = errors.New("branch config: invalid merge")

// Returns the current directory git commit hash if possible
// If we are not in a git repo it will return an empty string
func gracefulGitRepoHead(path string) (*HeadCommit, error) {
Expand Down Expand Up @@ -293,6 +296,14 @@ func gracefulGitRepoHead(path string) (*HeadCommit, error) {

remotes, err := repo.Remotes()
if err != nil {
// go-git does an additional validation that the branch is pushed upstream
// we do not care about that use-case, so we ignore the error
// we compare by error string because go-git does not expose the error type
// and errors.Is require the same instance of the error
if err.Error() == errBranchInvalidMerge.Error() {
return c, nil
}

return nil, fmt.Errorf("getting remotes: %w", err)
}

Expand Down