Browse Source

Fix ambiguous argument error on tags (#15432) (#15474)

Backport #15432

There is a weird gotcha with GetTagCommitID that because it uses git rev-list
can cause an ambiguous argument error.

This PR simply makes tags use the same code as branches.

Signed-off-by: Andrew Thornton <art27@cantab.net>
mj-v1.14.3
zeripath 1 year ago
committed by GitHub
parent
commit
2c4f1ed13e
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 9
      modules/git/repo_commit.go

9
modules/git/repo_commit.go

@ -21,14 +21,7 @@ func (repo *Repository) GetBranchCommitID(name string) (string, error) {
// GetTagCommitID returns last commit ID string of given tag.
func (repo *Repository) GetTagCommitID(name string) (string, error) {
stdout, err := NewCommand("rev-list", "-n", "1", TagPrefix+name).RunInDir(repo.Path)
if err != nil {
if strings.Contains(err.Error(), "unknown revision or path") {
return "", ErrNotExist{name, ""}
}
return "", err
}
return strings.TrimSpace(stdout), nil
return repo.GetRefCommitID(TagPrefix + name)
}
// ConvertToSHA1 returns a Hash object from a potential ID string

Loading…
Cancel
Save