From 2c4f1ed13e032b61720a4adf5243fb6b98658836 Mon Sep 17 00:00:00 2001 From: zeripath Date: Wed, 14 Apr 2021 19:53:01 +0100 Subject: [PATCH] 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 --- modules/git/repo_commit.go | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/modules/git/repo_commit.go b/modules/git/repo_commit.go index ea0aeeb35..5e2db34fd 100644 --- a/modules/git/repo_commit.go +++ b/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