diff options
Diffstat (limited to 'object')
| -rw-r--r-- | object/fetch/peel_to_blob.go | 2 | ||||
| -rw-r--r-- | object/fetch/peel_to_blob_id.go | 2 | ||||
| -rw-r--r-- | object/fetch/peel_to_commit.go | 2 | ||||
| -rw-r--r-- | object/fetch/peel_to_commit_id.go | 2 | ||||
| -rw-r--r-- | object/fetch/peel_to_tree.go | 2 | ||||
| -rw-r--r-- | object/fetch/peel_to_tree_id.go | 2 | ||||
| -rw-r--r-- | object/tag/parse.go | 2 | ||||
| -rw-r--r-- | object/tag/parse_test.go | 4 | ||||
| -rw-r--r-- | object/tag/serialize.go | 4 | ||||
| -rw-r--r-- | object/tag/tag.go | 2 |
10 files changed, 12 insertions, 12 deletions
diff --git a/object/fetch/peel_to_blob.go b/object/fetch/peel_to_blob.go index adf86495..121bb70b 100644 --- a/object/fetch/peel_to_blob.go +++ b/object/fetch/peel_to_blob.go @@ -23,7 +23,7 @@ func (r *Fetcher) PeelToBlob(id objectid.ObjectID) (*stored.Stored[*blob.Blob], case *blob.Blob: return stored.New(id, parsed), nil case *tag.Tag: - id = parsed.Target + id = parsed.TargetID default: return nil, &giterrors.ObjectTypeError{OID: id, Got: parsed.ObjectType(), Want: objecttype.TypeBlob} } diff --git a/object/fetch/peel_to_blob_id.go b/object/fetch/peel_to_blob_id.go index 7a43b4cc..82f23c91 100644 --- a/object/fetch/peel_to_blob_id.go +++ b/object/fetch/peel_to_blob_id.go @@ -23,7 +23,7 @@ func (r *Fetcher) PeelToBlobID(id objectid.ObjectID) (objectid.ObjectID, error) return objectid.ObjectID{}, err } - id = tag.Object().Target + id = tag.Object().TargetID case objecttype.TypeInvalid, objecttype.TypeCommit, objecttype.TypeTree, diff --git a/object/fetch/peel_to_commit.go b/object/fetch/peel_to_commit.go index e5fdce2b..569ea7a8 100644 --- a/object/fetch/peel_to_commit.go +++ b/object/fetch/peel_to_commit.go @@ -23,7 +23,7 @@ func (r *Fetcher) PeelToCommit(id objectid.ObjectID) (*stored.Stored[*commit.Com case *commit.Commit: return stored.New(id, parsed), nil case *tag.Tag: - id = parsed.Target + id = parsed.TargetID default: return nil, &giterrors.ObjectTypeError{OID: id, Got: parsed.ObjectType(), Want: objecttype.TypeCommit} } diff --git a/object/fetch/peel_to_commit_id.go b/object/fetch/peel_to_commit_id.go index 7b58bdea..9d7fdbc9 100644 --- a/object/fetch/peel_to_commit_id.go +++ b/object/fetch/peel_to_commit_id.go @@ -23,7 +23,7 @@ func (r *Fetcher) PeelToCommitID(id objectid.ObjectID) (objectid.ObjectID, error return objectid.ObjectID{}, err } - id = tag.Object().Target + id = tag.Object().TargetID case objecttype.TypeInvalid, objecttype.TypeTree, objecttype.TypeBlob, diff --git a/object/fetch/peel_to_tree.go b/object/fetch/peel_to_tree.go index adc87e6b..8898746b 100644 --- a/object/fetch/peel_to_tree.go +++ b/object/fetch/peel_to_tree.go @@ -27,7 +27,7 @@ func (r *Fetcher) PeelToTree(id objectid.ObjectID) (*stored.Stored[*tree.Tree], case *commit.Commit: return r.ExactTree(parsed.Tree) case *tag.Tag: - id = parsed.Target + id = parsed.TargetID default: return nil, &giterrors.ObjectTypeError{OID: id, Got: parsed.ObjectType(), Want: objecttype.TypeTree} } diff --git a/object/fetch/peel_to_tree_id.go b/object/fetch/peel_to_tree_id.go index 4c9bdac9..8482d28e 100644 --- a/object/fetch/peel_to_tree_id.go +++ b/object/fetch/peel_to_tree_id.go @@ -31,7 +31,7 @@ func (r *Fetcher) PeelToTreeID(id objectid.ObjectID) (objectid.ObjectID, error) return objectid.ObjectID{}, err } - id = tag.Object().Target + id = tag.Object().TargetID case objecttype.TypeInvalid, objecttype.TypeBlob, objecttype.TypeFuture, diff --git a/object/tag/parse.go b/object/tag/parse.go index 92fa0d8b..2876ec6d 100644 --- a/object/tag/parse.go +++ b/object/tag/parse.go @@ -42,7 +42,7 @@ func Parse(body []byte, algo objectid.Algorithm) (*Tag, error) { return nil, fmt.Errorf("object: tag: object: %w", err) } - t.Target = id + t.TargetID = id haveTarget = true case "type": ty, ok := objecttype.Parse(string(value)) diff --git a/object/tag/parse_test.go b/object/tag/parse_test.go index 293350ed..18f38aaa 100644 --- a/object/tag/parse_test.go +++ b/object/tag/parse_test.go @@ -24,8 +24,8 @@ func TestTagParseFromGit(t *testing.T) { t.Fatalf("ParseTag: %v", err) } - if parsed.Target != commitID { - t.Fatalf("tag target mismatch: got %s want %s", parsed.Target, commitID) + if parsed.TargetID != commitID { + t.Fatalf("tag target mismatch: got %s want %s", parsed.TargetID, commitID) } if parsed.TargetType != objecttype.TypeCommit { diff --git a/object/tag/serialize.go b/object/tag/serialize.go index 43fad522..301984cc 100644 --- a/object/tag/serialize.go +++ b/object/tag/serialize.go @@ -11,12 +11,12 @@ import ( // BytesWithoutHeader renders the raw tag body bytes. func (tag *Tag) BytesWithoutHeader() ([]byte, error) { - if tag.Target.Algorithm().Size() == 0 { + if tag.TargetID.Algorithm().Size() == 0 { return nil, errors.New("object: tag: missing target id") } var buf bytes.Buffer - fmt.Fprintf(&buf, "object %s\n", tag.Target.String()) + fmt.Fprintf(&buf, "object %s\n", tag.TargetID.String()) tyName, ok := tag.TargetType.Name() if !ok { diff --git a/object/tag/tag.go b/object/tag/tag.go index e01f8ac9..4fcc88b0 100644 --- a/object/tag/tag.go +++ b/object/tag/tag.go @@ -16,7 +16,7 @@ import ( // // Labels: MT-Unsafe. type Tag struct { - Target objectid.ObjectID + TargetID objectid.ObjectID TargetType objecttype.Type Name []byte Tagger *objectsignature.Signature |
