Browse Source

Backport: Strict name matching for Repository.GetTagID() (#8082)

* Strict name matching for Repository.GetTagID()

* Add test for GetTagID()
tags/v1.9.3
guillep2k 4 years ago
parent
commit
bb609cacee
2 changed files with 17 additions and 4 deletions
  1. 7
    4
      modules/git/repo_tag.go
  2. 10
    0
      modules/git/repo_tag_test.go

+ 7
- 4
modules/git/repo_tag.go View File

if err != nil { if err != nil {
return "", err return "", err
} }
fields := strings.Fields(stdout)
if len(fields) != 2 {
return "", ErrNotExist{ID: name}
// Make sure exact match is used: "v1" != "release/v1"
for _, line := range strings.Split(stdout, "\n") {
fields := strings.Fields(line)
if len(fields) == 2 && fields[1] == "refs/tags/"+name {
return fields[0], nil
}
} }
return fields[0], nil
return "", ErrNotExist{ID: name}
} }


// GetTag returns a Git tag by given name. // GetTag returns a Git tag by given name.

+ 10
- 0
modules/git/repo_tag_test.go View File

assert.NotEqual(t, aTagID, aTag.Object.String()) assert.NotEqual(t, aTagID, aTag.Object.String())
assert.EqualValues(t, aTagCommitID, aTag.Object.String()) assert.EqualValues(t, aTagCommitID, aTag.Object.String())
assert.EqualValues(t, "tag", aTag.Type) assert.EqualValues(t, "tag", aTag.Type)

rTagCommitID := "8006ff9adbf0cb94da7dad9e537e53817f9fa5c0"
rTagName := "release/" + lTagName
bareRepo1.CreateTag(rTagName, rTagCommitID)
rTagID, err := bareRepo1.GetTagID(rTagName)
assert.NoError(t, err)
assert.EqualValues(t, rTagCommitID, rTagID)
oTagID, err := bareRepo1.GetTagID(lTagName)
assert.NoError(t, err)
assert.EqualValues(t, lTagCommitID, oTagID)
} }


func TestRepository_GetAnnotatedTag(t *testing.T) { func TestRepository_GetAnnotatedTag(t *testing.T) {

Loading…
Cancel
Save