Skip to content
This repository was archived by the owner on Sep 11, 2020. It is now read-only.

Commit f8adfff

Browse files
committed
git: s/TagObjectOptions/CreateTagOptions/
Just renaming the TagObjectOptions type to CreateTagOptions so that it's consistent with the other option types. Signed-off-by: Chris Marchesi <chrism@vancluevertech.com>
1 parent 9cc654c commit f8adfff

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

options.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -385,8 +385,8 @@ var (
385385
ErrMissingMessage = errors.New("message field is required")
386386
)
387387

388-
// TagObjectOptions describes how a tag object should be created.
389-
type TagObjectOptions struct {
388+
// CreateTagOptions describes how a tag object should be created.
389+
type CreateTagOptions struct {
390390
// Tagger defines the signature of the tag creator.
391391
Tagger *object.Signature
392392
// Message defines the annotation of the tag. It is canonicalized during
@@ -399,7 +399,7 @@ type TagObjectOptions struct {
399399
}
400400

401401
// Validate validates the fields and sets the default values.
402-
func (o *TagObjectOptions) Validate(r *Repository, hash plumbing.Hash) error {
402+
func (o *CreateTagOptions) Validate(r *Repository, hash plumbing.Hash) error {
403403
if o.Tagger == nil {
404404
return ErrMissingTagger
405405
}

repository.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,7 @@ func (r *Repository) DeleteBranch(name string) error {
494494

495495
// CreateTag creates a tag. If opts is included, the tag is an annotated tag,
496496
// otherwise a lightweight tag is created.
497-
func (r *Repository) CreateTag(name string, hash plumbing.Hash, opts *TagObjectOptions) (*plumbing.Reference, error) {
497+
func (r *Repository) CreateTag(name string, hash plumbing.Hash, opts *CreateTagOptions) (*plumbing.Reference, error) {
498498
rname := plumbing.ReferenceName(path.Join("refs", "tags", name))
499499

500500
_, err := r.Storer.Reference(rname)
@@ -527,7 +527,7 @@ func (r *Repository) CreateTag(name string, hash plumbing.Hash, opts *TagObjectO
527527
return ref, nil
528528
}
529529

530-
func (r *Repository) createTagObject(name string, hash plumbing.Hash, opts *TagObjectOptions) (plumbing.Hash, error) {
530+
func (r *Repository) createTagObject(name string, hash plumbing.Hash, opts *CreateTagOptions) (plumbing.Hash, error) {
531531
if err := opts.Validate(r, hash); err != nil {
532532
return plumbing.ZeroHash, err
533533
}

repository_test.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1331,7 +1331,7 @@ func (s *RepositorySuite) TestCreateTagAnnotated(c *C) {
13311331

13321332
expectedHash := h.Hash()
13331333

1334-
ref, err := r.CreateTag("foobar", expectedHash, &TagObjectOptions{
1334+
ref, err := r.CreateTag("foobar", expectedHash, &CreateTagOptions{
13351335
Tagger: defaultSignature(),
13361336
Message: "foo bar baz qux",
13371337
})
@@ -1363,13 +1363,13 @@ func (s *RepositorySuite) TestCreateTagAnnotatedBadOpts(c *C) {
13631363

13641364
expectedHash := h.Hash()
13651365

1366-
ref, err := r.CreateTag("foobar", expectedHash, &TagObjectOptions{
1366+
ref, err := r.CreateTag("foobar", expectedHash, &CreateTagOptions{
13671367
Message: "foo bar baz qux",
13681368
})
13691369
c.Assert(ref, IsNil)
13701370
c.Assert(err, Equals, ErrMissingTagger)
13711371

1372-
ref, err = r.CreateTag("foobar", expectedHash, &TagObjectOptions{
1372+
ref, err = r.CreateTag("foobar", expectedHash, &CreateTagOptions{
13731373
Tagger: defaultSignature(),
13741374
})
13751375
c.Assert(ref, IsNil)
@@ -1385,7 +1385,7 @@ func (s *RepositorySuite) TestCreateTagAnnotatedBadHash(c *C) {
13851385
err := r.clone(context.Background(), &CloneOptions{URL: url})
13861386
c.Assert(err, IsNil)
13871387

1388-
ref, err := r.CreateTag("foobar", plumbing.ZeroHash, &TagObjectOptions{
1388+
ref, err := r.CreateTag("foobar", plumbing.ZeroHash, &CreateTagOptions{
13891389
Tagger: defaultSignature(),
13901390
Message: "foo bar baz qux",
13911391
})
@@ -1406,7 +1406,7 @@ func (s *RepositorySuite) TestCreateTagSigned(c *C) {
14061406
c.Assert(err, IsNil)
14071407

14081408
key := commitSignKey(c, true)
1409-
_, err = r.CreateTag("foobar", h.Hash(), &TagObjectOptions{
1409+
_, err = r.CreateTag("foobar", h.Hash(), &CreateTagOptions{
14101410
Tagger: defaultSignature(),
14111411
Message: "foo bar baz qux",
14121412
SignKey: key,
@@ -1447,7 +1447,7 @@ func (s *RepositorySuite) TestCreateTagSignedBadKey(c *C) {
14471447
c.Assert(err, IsNil)
14481448

14491449
key := commitSignKey(c, false)
1450-
_, err = r.CreateTag("foobar", h.Hash(), &TagObjectOptions{
1450+
_, err = r.CreateTag("foobar", h.Hash(), &CreateTagOptions{
14511451
Tagger: defaultSignature(),
14521452
Message: "foo bar baz qux",
14531453
SignKey: key,
@@ -1468,7 +1468,7 @@ func (s *RepositorySuite) TestCreateTagCanonicalize(c *C) {
14681468
c.Assert(err, IsNil)
14691469

14701470
key := commitSignKey(c, true)
1471-
_, err = r.CreateTag("foobar", h.Hash(), &TagObjectOptions{
1471+
_, err = r.CreateTag("foobar", h.Hash(), &CreateTagOptions{
14721472
Tagger: defaultSignature(),
14731473
Message: "\n\nfoo bar baz qux\n\nsome message here",
14741474
SignKey: key,
@@ -1637,7 +1637,7 @@ func (s *RepositorySuite) TestDeleteTagAnnotatedUnpacked(c *C) {
16371637

16381638
expectedHash := h.Hash()
16391639

1640-
ref, err := r.CreateTag("foobar", expectedHash, &TagObjectOptions{
1640+
ref, err := r.CreateTag("foobar", expectedHash, &CreateTagOptions{
16411641
Tagger: defaultSignature(),
16421642
Message: "foo bar baz qux",
16431643
})

0 commit comments

Comments
 (0)