tag: use name not refspec

gogs · Mar 8, 2020 · 8d75155 · 8d75155
1 parent 86b0130
commit 8d75155
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 14 deletions.
diff --git a/repo_hook.go b/repo_hook.go
@@ -23,7 +23,7 @@ func (r *Repository) NewHook(dir string, name HookName) *Hook {
 }
 
 // Hook returns a Git hook by given name in the repository. Giving empty directory
-// will use the default directory.It returns an os.ErrNotExist if both active and
+// will use the default directory. It returns an os.ErrNotExist if both active and
 // sample hook do not exist.
 func (r *Repository) Hook(dir string, name HookName) (*Hook, error) {
 	if dir == "" {

diff --git a/repo_tag.go b/repo_tag.go
@@ -107,16 +107,17 @@ type TagOptions struct {
 	Timeout time.Duration
 }
 
-// Tag returns a Git tag by given refspec, e.g. "refs/tags/v1.0.0".
-func (r *Repository) Tag(refspec string, opts ...TagOptions) (*Tag, error) {
+// Tag returns a Git tag by given name, e.g. "v1.0.0".
+func (r *Repository) Tag(name string, opts ...TagOptions) (*Tag, error) {
 	var opt TagOptions
 	if len(opts) > 0 {
 		opt = opts[0]
 	}
 
+	refsepc := RefsTags + name
 	refs, err := r.ShowRef(ShowRefOptions{
 		Tags:     true,
-		Patterns: []string{refspec},
+		Patterns: []string{refsepc},
 		Timeout:  opt.Timeout,
 	})
 	if err != nil {
@@ -134,7 +135,7 @@ func (r *Repository) Tag(refspec string, opts ...TagOptions) (*Tag, error) {
 	if err != nil {
 		return nil, err
 	}
-	tag.refspec = refspec
+	tag.refspec = refsepc
 	return tag, nil
 }
 

diff --git a/repo_tag_test.go b/repo_tag_test.go
@@ -12,31 +12,31 @@ import (
 
 func TestRepository_Tag(t *testing.T) {
 	tests := []struct {
-		refspec string
-		opt     TagOptions
-		expTag  *Tag
+		name   string
+		opt    TagOptions
+		expTag *Tag
 	}{
 		{
-			refspec: "v1.0.0",
+			name: "v1.0.0",
 			expTag: &Tag{
 				typ:      ObjectCommit,
 				id:       MustIDFromString("0eedd79eba4394bbef888c804e899731644367fe"),
 				commitID: MustIDFromString("0eedd79eba4394bbef888c804e899731644367fe"),
-				refspec:  "v1.0.0",
+				refspec:  "refs/tags/v1.0.0",
 			},
 		}, {
-			refspec: "v1.1.0",
+			name: "v1.1.0",
 			expTag: &Tag{
 				typ:      ObjectTag,
 				id:       MustIDFromString("b39c8508bbc4b00ad2e24d358012ea123bcafd8d"),
 				commitID: MustIDFromString("0eedd79eba4394bbef888c804e899731644367fe"),
-				refspec:  "v1.1.0",
+				refspec:  "refs/tags/v1.1.0",
 			},
 		},
 	}
 	for _, test := range tests {
 		t.Run("", func(t *testing.T) {
-			tag, err := testrepo.Tag(test.refspec, test.opt)
+			tag, err := testrepo.Tag(test.name, test.opt)
 			if err != nil {
 				t.Fatal(err)
 			}

diff --git a/tag_test.go b/tag_test.go
@@ -19,7 +19,7 @@ func TestTag(t *testing.T) {
 	assert.Equal(t, ObjectTag, tag.Type())
 	assert.Equal(t, "b39c8508bbc4b00ad2e24d358012ea123bcafd8d", tag.ID().String())
 	assert.Equal(t, "0eedd79eba4394bbef888c804e899731644367fe", tag.CommitID().String())
-	assert.Equal(t, "v1.1.0", tag.Refspec())
+	assert.Equal(t, "refs/tags/v1.1.0", tag.Refspec())
 
 	t.Run("Tagger", func(t *testing.T) {
 		assert.Equal(t, "Joe Chen", tag.Tagger().Name)