Skip to content
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

Jump to bottom

Do not assume all 40 char strings are SHA1s #14624

Merged
merged 3 commits into from
Feb 10, 2021
Merged

Do not assume all 40 char strings are SHA1s #14624

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7c2a779
Do not assume all 40 char strings are SHA1s
zeripath Feb 9, 2021
939c03f
Merge branch 'master' into fix-14470-dont-assume-all-40-char-strings-…
lunny Feb 10, 2021
79891ea
Merge branch 'master' into fix-14470-dont-assume-all-40-char-strings-…
zeripath Feb 10, 2021
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
26 changes: 15 additions & 11 deletions modules/git/repo_commit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,19 +31,23 @@ func (repo *Repository) GetTagCommitID(name string) (string, error) {

// ConvertToSHA1 returns a Hash object from a potential ID string
func (repo *Repository) ConvertToSHA1(commitID string) (SHA1, error) {
if len(commitID) != 40 {
var err error
actualCommitID, err := NewCommand("rev-parse", "--verify", commitID).RunInDir(repo.Path)
if err != nil {
if strings.Contains(err.Error(), "unknown revision or path") ||
strings.Contains(err.Error(), "fatal: Needed a single revision") {
return SHA1{}, ErrNotExist{commitID, ""}
}
return SHA1{}, err
if len(commitID) == 40 {
sha1, err := NewIDFromString(commitID)
if err == nil {
return sha1, nil
}
commitID = actualCommitID
}
return NewIDFromString(commitID)

actualCommitID, err := NewCommand("rev-parse", "--verify", commitID).RunInDir(repo.Path)
if err != nil {
if strings.Contains(err.Error(), "unknown revision or path") ||
strings.Contains(err.Error(), "fatal: Needed a single revision") {
return SHA1{}, ErrNotExist{commitID, ""}
}
return SHA1{}, err
}

return NewIDFromString(actualCommitID)
}

// GetCommit returns commit object of by ID string.
Expand Down