diff options
Diffstat (limited to 'object/commit')
| -rw-r--r-- | object/commit/append.go | 2 | ||||
| -rw-r--r-- | object/commit/append_test.go | 6 | ||||
| -rw-r--r-- | object/commit/parse_test.go | 6 | ||||
| -rw-r--r-- | object/commit/roundtrip_test.go | 8 | ||||
| -rw-r--r-- | object/commit/type.go | 2 |
5 files changed, 12 insertions, 12 deletions
diff --git a/object/commit/append.go b/object/commit/append.go index 84410b80..b637620e 100644 --- a/object/commit/append.go +++ b/object/commit/append.go @@ -61,7 +61,7 @@ func (commit *Commit) AppendWithHeader(dst []byte) ([]byte, error) { return dst, err } - dst = header.Append(dst, typ.TypeCommit, uint64(len(body))) + dst = header.Append(dst, typ.Commit, uint64(len(body))) return append(dst, body...), nil } diff --git a/object/commit/append_test.go b/object/commit/append_test.go index ca32903f..7a54f19e 100644 --- a/object/commit/append_test.go +++ b/object/commit/append_test.go @@ -24,13 +24,13 @@ func TestAppendGitFsck(t *testing.T) { t.Fatalf("NewRepo: %v", err) } - blobID, err := repo.HashObject(t, typ.TypeBlob, strings.NewReader("content\n")) + blobID, err := repo.HashObject(t, typ.Blob, strings.NewReader("content\n")) if err != nil { t.Fatalf("HashObject(blob): %v", err) } treeID, err := repo.MkTree(t, []testgit.TreeEntry{ - {Mode: "100644", Type: typ.TypeBlob, OID: blobID, Name: "file.txt"}, + {Mode: "100644", Type: typ.Blob, OID: blobID, Name: "file.txt"}, }) if err != nil { t.Fatalf("MkTree: %v", err) @@ -58,7 +58,7 @@ func TestAppendGitFsck(t *testing.T) { t.Fatalf("AppendWithoutHeader: %v", err) } - commitID, err := repo.HashObject(t, typ.TypeCommit, bytes.NewReader(rawBody)) + commitID, err := repo.HashObject(t, typ.Commit, bytes.NewReader(rawBody)) if err != nil { t.Fatalf("HashObject(commit): %v", err) } diff --git a/object/commit/parse_test.go b/object/commit/parse_test.go index 48202676..2264f84d 100644 --- a/object/commit/parse_test.go +++ b/object/commit/parse_test.go @@ -39,13 +39,13 @@ func TestParse(t *testing.T) { t.Fatalf("NewRepo: %v", err) } - blobID, err := repo.HashObject(t, typ.TypeBlob, strings.NewReader("content\n")) + blobID, err := repo.HashObject(t, typ.Blob, strings.NewReader("content\n")) if err != nil { t.Fatalf("HashObject: %v", err) } treeID, err := repo.MkTree(t, []testgit.TreeEntry{ - {Mode: "100644", Type: typ.TypeBlob, OID: blobID, Name: "file.txt"}, + {Mode: "100644", Type: typ.Blob, OID: blobID, Name: "file.txt"}, }) if err != nil { t.Fatalf("MkTree: %v", err) @@ -96,7 +96,7 @@ func TestParse(t *testing.T) { }, } { t.Run(tc.name, func(t *testing.T) { - rawBody, err := repo.CatFile(t, typ.TypeCommit, tc.oid) + rawBody, err := repo.CatFile(t, typ.Commit, tc.oid) if err != nil { t.Fatalf("CatFile: %v", err) } diff --git a/object/commit/roundtrip_test.go b/object/commit/roundtrip_test.go index 8169e75f..faa8a834 100644 --- a/object/commit/roundtrip_test.go +++ b/object/commit/roundtrip_test.go @@ -25,13 +25,13 @@ func TestRoundTrip(t *testing.T) { t.Fatalf("NewRepo: %v", err) } - blobID, err := repo.HashObject(t, typ.TypeBlob, strings.NewReader("roundtrip\n")) + blobID, err := repo.HashObject(t, typ.Blob, strings.NewReader("roundtrip\n")) if err != nil { t.Fatalf("HashObject(blob): %v", err) } treeID, err := repo.MkTree(t, []testgit.TreeEntry{ - {Mode: "100644", Type: typ.TypeBlob, OID: blobID, Name: "roundtrip.txt"}, + {Mode: "100644", Type: typ.Blob, OID: blobID, Name: "roundtrip.txt"}, }) if err != nil { t.Fatalf("MkTree: %v", err) @@ -99,7 +99,7 @@ func TestRoundTrip(t *testing.T) { t.Fatalf("AppendWithoutHeader: %v", err) } - roundTripID, err := repo.HashObject(t, typ.TypeCommit, bytes.NewReader(rawBody)) + roundTripID, err := repo.HashObject(t, typ.Commit, bytes.NewReader(rawBody)) if err != nil { t.Fatalf("HashObject(commit): %v", err) } @@ -112,7 +112,7 @@ func TestRoundTrip(t *testing.T) { t.Fatalf("Fsck: %v", err) } - gitBody, err := repo.CatFile(t, typ.TypeCommit, roundTripID) + gitBody, err := repo.CatFile(t, typ.Commit, roundTripID) if err != nil { t.Fatalf("CatFile: %v", err) } diff --git a/object/commit/type.go b/object/commit/type.go index 80715a72..2ec67320 100644 --- a/object/commit/type.go +++ b/object/commit/type.go @@ -8,5 +8,5 @@ import ( func (commit *Commit) ObjectType() typ.Type { _ = commit - return typ.TypeCommit + return typ.Commit } |