Skip to content

Commit 0fcb9c3

Browse files
ttaylorrttaylorr
committed
*: rename 'git/odb' to 'gitobj'
1 parent 8427eb4 commit 0fcb9c3

27 files changed

+48
-48
lines changed

‎blob.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,13 @@ func NewBlobFromBytes(contents []byte) *Blob {
4141
func NewBlobFromFile(path string) (*Blob, error) {
4242
f, err := os.Open(path)
4343
if err != nil {
44-
return nil, fmt.Errorf("git/odb: could not open: %s: %s", path,
44+
return nil, fmt.Errorf("gitobj: could not open: %s: %s", path,
4545
err)
4646
}
4747

4848
stat, err := f.Stat()
4949
if err != nil {
50-
return nil, fmt.Errorf("git/odb: could not stat %s: %s", path,
50+
return nil, fmt.Errorf("gitobj: could not stat %s: %s", path,
5151
err)
5252
}
5353

@@ -58,7 +58,7 @@ func NewBlobFromFile(path string) (*Blob, error) {
5858
closeFn: func() error {
5959
if err := f.Close(); err != nil {
6060
return fmt.Errorf(
61-
"git/odb: could not close %s: %s",
61+
"gitobj: could not close %s: %s",
6262
path, err)
6363
}
6464
return nil

‎errors.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ type UnexpectedObjectType struct {
1414

1515
// Error implements the error.Error() function.
1616
func (e *UnexpectedObjectType) Error() string {
17-
return fmt.Sprintf("git/odb: unexpected object type, got: %q, wanted: %q", e.Got, e.Wanted)
17+
return fmt.Sprintf("gitobj: unexpected object type, got: %q, wanted: %q", e.Got, e.Wanted)
1818
}

‎errors_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ func TestUnexpectedObjectTypeErrFormatting(t *testing.T) {
1111
Got: TreeObjectType, Wanted: BlobObjectType,
1212
}
1313

14-
assert.Equal(t, "git/odb: unexpected object type, got: \"tree\", wanted: \"blob\"", err.Error())
14+
assert.Equal(t, "gitobj: unexpected object type, got: \"tree\", wanted: \"blob\"", err.Error())
1515
}

‎object_db.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ func FromFilesystem(root, tmp string) (*ObjectDatabase, error) {
5757
// If Close() has already been called, this function will return an error.
5858
func (o *ObjectDatabase) Close() error {
5959
if !atomic.CompareAndSwapUint32(&o.closed, 0, 1) {
60-
return fmt.Errorf("git/odb: *ObjectDatabase already closed")
60+
return fmt.Errorf("gitobj: *ObjectDatabase already closed")
6161
}
6262

6363
if err := o.packs.Close(); err != nil {
@@ -245,7 +245,7 @@ func (o *ObjectDatabase) open(sha []byte) (*ObjectReader, error) {
245245
// load its contents from the *git.ObjectScanner by leveraging
246246
// `git-cat-file --batch`.
247247
if atomic.LoadUint32(&o.closed) == 1 {
248-
return nil, fmt.Errorf("git/odb: cannot use closed *pack.Set")
248+
return nil, fmt.Errorf("gitobj: cannot use closed *pack.Set")
249249
}
250250

251251
packed, err := o.packs.Object(sha)
@@ -279,7 +279,7 @@ func (o *ObjectDatabase) open(sha []byte) (*ObjectReader, error) {
279279
// the `io.Closer` interface), but skips this if the "into" Object is of type
280280
// BlobObjectType. Blob's don't exhaust the buffer completely (they instead
281281
// maintain a handle on the blob's contents via an io.LimitedReader) and
282-
// therefore cannot be closed until signaled explicitly by git/odb.Blob.Close().
282+
// therefore cannot be closed until signaled explicitly by gitobj.Blob.Close().
283283
func (o *ObjectDatabase) decode(sha []byte, into Object) error {
284284
r, err := o.open(sha)
285285
if err != nil {

‎object_db_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ func TestReadingAMissingObjectAfterClose(t *testing.T) {
226226
}
227227

228228
blob, err := db.Blob(sha)
229-
assert.EqualError(t, err, "git/odb: cannot use closed *pack.Set")
229+
assert.EqualError(t, err, "gitobj: cannot use closed *pack.Set")
230230
assert.Nil(t, blob)
231231
}
232232

@@ -235,7 +235,7 @@ func TestClosingAnObjectDatabaseMoreThanOnce(t *testing.T) {
235235
assert.Nil(t, err)
236236

237237
assert.Nil(t, db.Close())
238-
assert.EqualError(t, db.Close(), "git/odb: *ObjectDatabase already closed")
238+
assert.EqualError(t, db.Close(), "gitobj: *ObjectDatabase already closed")
239239
}
240240

241241
func TestObjectDatabaseRootWithRoot(t *testing.T) {

‎object_reader.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ func (r *ObjectReader) Header() (typ ObjectType, size int64, err error) {
106106
}
107107
if len(typs) == 0 {
108108
return UnknownObjectType, 0, fmt.Errorf(
109-
"git/odb: object type must not be empty",
109+
"gitobj: object type must not be empty",
110110
)
111111
}
112112
typs = strings.TrimSuffix(typs, " ")

‎object_writer.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ func NewObjectWriteCloser(w io.WriteCloser) *ObjectWriter {
8585
// WriteHeader MUST be called only once, or a panic() will occur.
8686
func (w *ObjectWriter) WriteHeader(typ ObjectType, len int64) (n int, err error) {
8787
if !atomic.CompareAndSwapUint32(&w.wroteHeader, 0, 1) {
88-
panic("git/odb: cannot write headers more than once")
88+
panic("gitobj: cannot write headers more than once")
8989
}
9090
return fmt.Fprintf(w, "%s %d\x00", typ, len)
9191
}
@@ -98,7 +98,7 @@ func (w *ObjectWriter) WriteHeader(typ ObjectType, len int64) (n int, err error)
9898
// occur.
9999
func (w *ObjectWriter) Write(p []byte) (n int, err error) {
100100
if atomic.LoadUint32(&w.wroteHeader) != 1 {
101-
panic("git/odb: cannot write data without header")
101+
panic("gitobj: cannot write data without header")
102102
}
103103
return w.w.Write(p)
104104
}

‎object_writer_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ func TestObjectWriterPanicsOnWritesWithoutHeader(t *testing.T) {
6161
err := recover()
6262

6363
assert.NotNil(t, err)
64-
assert.Equal(t, "git/odb: cannot write data without header", err)
64+
assert.Equal(t, "gitobj: cannot write data without header", err)
6565
}()
6666

6767
w := NewObjectWriter(new(bytes.Buffer))
@@ -73,7 +73,7 @@ func TestObjectWriterPanicsOnMultipleHeaderWrites(t *testing.T) {
7373
err := recover()
7474

7575
assert.NotNil(t, err)
76-
assert.Equal(t, "git/odb: cannot write headers more than once", err)
76+
assert.Equal(t, "gitobj: cannot write headers more than once", err)
7777
}()
7878

7979
w := NewObjectWriter(new(bytes.Buffer))

‎pack/bounds.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import "fmt"
99
// inclusive or exclusive. *bounds makes no assumptions on the inclusivity of
1010
// those values.
1111
//
12-
// See: *git/odb/pack.Index for more.
12+
// See: *gitobj/pack.Index for more.
1313
type bounds struct {
1414
// left is the left or lower bound of the bounds.
1515
left int64

‎pack/chain_delta.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ func patch(base, delta []byte) ([]byte, error) {
4747
//
4848
// If this does not match with the srcSize, return an error
4949
// early so as to avoid a possible bounds error below.
50-
return nil, fmt.Errorf("git/odb/pack: invalid delta data")
50+
return nil, fmt.Errorf("gitobj/pack: invalid delta data")
5151
}
5252

5353
// The remainder of the delta header contains the destination size, and
@@ -135,7 +135,7 @@ func patch(base, delta []byte) ([]byte, error) {
135135
//
136136
// Return immediately.
137137
return nil, fmt.Errorf(
138-
"git/odb/pack: invalid delta data")
138+
"gitobj/pack: invalid delta data")
139139
}
140140
}
141141

@@ -145,7 +145,7 @@ func patch(base, delta []byte) ([]byte, error) {
145145
// an invalid set of patch instructions.
146146
//
147147
// Return immediately.
148-
return nil, fmt.Errorf("git/odb/pack: invalid delta data")
148+
return nil, fmt.Errorf("gitobj/pack: invalid delta data")
149149
}
150150
return dest, nil
151151
}
@@ -159,7 +159,7 @@ func patchDeltaHeader(delta []byte, pos int) (size int64, end int) {
159159

160160
for shift == 0 || c&0x80 != 0 {
161161
if len(delta) <= pos {
162-
panic("git/odb/pack: invalid delta header")
162+
panic("gitobj/pack: invalid delta header")
163163
}
164164

165165
c = int64(delta[pos])

‎pack/chain_delta_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ func TestChainDeltaWithInvalidDeltaInstruction(t *testing.T) {
8787
}
8888

8989
data, err := c.Unpack()
90-
assert.EqualError(t, err, "git/odb/pack: invalid delta data")
90+
assert.EqualError(t, err, "gitobj/pack: invalid delta data")
9191
assert.Nil(t, data)
9292
}
9393

@@ -107,6 +107,6 @@ func TestChainDeltaWithExtraInstructions(t *testing.T) {
107107
}
108108

109109
data, err := c.Unpack()
110-
assert.EqualError(t, err, "git/odb/pack: invalid delta data")
110+
assert.EqualError(t, err, "gitobj/pack: invalid delta data")
111111
assert.Nil(t, data)
112112
}

‎pack/errors.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ type UnsupportedVersionErr struct {
1111

1212
// Error implements 'error.Error()'.
1313
func (u *UnsupportedVersionErr) Error() string {
14-
return fmt.Sprintf("git/odb/pack: unsupported version: %d", u.Got)
14+
return fmt.Sprintf("gitobj/pack: unsupported version: %d", u.Got)
1515
}

‎pack/errors_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ import (
99
func TestUnsupportedVersionErr(t *testing.T) {
1010
u := &UnsupportedVersionErr{Got: 3}
1111

12-
assert.Error(t, u, "git/odb/pack: unsupported version: 3")
12+
assert.Error(t, u, "gitobj/pack: unsupported version: 3")
1313
}

‎pack/index.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ func (i *Index) Close() error {
4242
var (
4343
// errNotFound is an error returned by Index.Entry() (see: below) when
4444
// an object cannot be found in the index.
45-
errNotFound = fmt.Errorf("git/odb/pack: object not found in index")
45+
errNotFound = fmt.Errorf("gitobj/pack: object not found in index")
4646
)
4747

4848
// IsNotFound returns whether a given error represents a missing object in the

‎pack/index_decode.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ const (
5656
var (
5757
// ErrShortFanout is an error representing situations where the entire
5858
// fanout table could not be read, and is thus too short.
59-
ErrShortFanout = fmt.Errorf("git/odb/pack: too short fanout table")
59+
ErrShortFanout = fmt.Errorf("gitobj/pack: too short fanout table")
6060

6161
// indexHeader is the first four "magic" bytes of index files version 2
6262
// or newer.

‎pack/index_decode_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ func TestDecodeIndexUnsupportedVersion(t *testing.T) {
6060

6161
idx, err := DecodeIndex(bytes.NewReader(buf))
6262

63-
assert.EqualError(t, err, "git/odb/pack: unsupported version: 3")
63+
assert.EqualError(t, err, "gitobj/pack: unsupported version: 3")
6464
assert.Nil(t, idx)
6565
}
6666

‎pack/index_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ func TestIndexIsNotFound(t *testing.T) {
8080
}
8181

8282
func TestIndexIsNotFoundForOtherErrors(t *testing.T) {
83-
assert.False(t, IsNotFound(fmt.Errorf("git/odb/pack: misc")),
83+
assert.False(t, IsNotFound(fmt.Errorf("gitobj/pack: misc")),
8484
"expected 'err' not to satisfy 'IsNotFound()'")
8585
}
8686

‎pack/io_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ func TestOffsetReaderAtReadsAtOffset(t *testing.T) {
3131
}
3232

3333
func TestOffsetReaderPropogatesErrors(t *testing.T) {
34-
expected := fmt.Errorf("git/odb/pack: testing")
34+
expected := fmt.Errorf("gitobj/pack: testing")
3535
bo := &OffsetReaderAt{
3636
r: &ErrReaderAt{Err: expected},
3737
o: 1,

‎pack/object_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ func TestObjectUnpackUnpacksData(t *testing.T) {
3131
}
3232

3333
func TestObjectUnpackPropogatesErrors(t *testing.T) {
34-
expected := fmt.Errorf("git/odb/pack: testing")
34+
expected := fmt.Errorf("gitobj/pack: testing")
3535

3636
o := &Object{
3737
data: &ChainSimple{

‎pack/packfile.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ func (p *Packfile) Object(name []byte) (*Object, error) {
5656
if !IsNotFound(err) {
5757
// If the error was not an errNotFound, re-wrap it with
5858
// additional context.
59-
err = fmt.Errorf("git/odb/pack: could not load index: %s", err)
59+
err = fmt.Errorf("gitobj/pack: could not load index: %s", err)
6060
}
6161
return nil, err
6262
}
@@ -224,7 +224,7 @@ func (p *Packfile) findBase(typ PackedObjectType, offset, objOffset int64) (Chai
224224
// If we did not receive an OBJ_OFS_DELTA, or OBJ_REF_DELTA, the
225225
// type given is not a delta-fied type. Return an error.
226226
return nil, baseOffset, fmt.Errorf(
227-
"git/odb/pack: type %s is not deltafied", typ)
227+
"gitobj/pack: type %s is not deltafied", typ)
228228
}
229229

230230
// Once we have determined the base offset of the object's chain base,

‎pack/packfile_decode.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ var (
1313

1414
// errBadPackHeader is a sentinel error value returned when the given
1515
// pack header does not match the expected one.
16-
errBadPackHeader = errors.New("git/odb/pack: bad pack header")
16+
errBadPackHeader = errors.New("gitobj/pack: bad pack header")
1717
)
1818

1919
// DecodePackfile opens the packfile given by the io.ReaderAt "r" for reading.

‎pack/packfile_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ func TestPackfileClosesReadClosers(t *testing.T) {
183183
}
184184

185185
func TestPackfileClosePropogatesCloseErrors(t *testing.T) {
186-
e := fmt.Errorf("git/odb/pack: testing")
186+
e := fmt.Errorf("gitobj/pack: testing")
187187
p := &Packfile{
188188
r: &ReaderAtCloser{E: e},
189189
}
@@ -268,7 +268,7 @@ func IndexWith(offsets map[string]uint32) *Index {
268268
func DecodeHex(t *testing.T, str string) []byte {
269269
b, err := hex.DecodeString(str)
270270
if err != nil {
271-
t.Fatalf("git/odb/pack: unexpected hex.DecodeString error: %s", err)
271+
t.Fatalf("gitobj/pack: unexpected hex.DecodeString error: %s", err)
272272
}
273273

274274
return b

‎pack/type.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ const (
2929
)
3030

3131
// String implements fmt.Stringer and returns an encoding of the type valid for
32-
// use in the loose object format protocol (see: package 'git/odb' for more).
32+
// use in the loose object format protocol (see: package 'gitobj' for more).
3333
//
3434
// If the receiving instance is not defined, String() will panic().
3535
func (t PackedObjectType) String() string {
@@ -50,9 +50,9 @@ func (t PackedObjectType) String() string {
5050
return "obj_ref_delta"
5151
}
5252

53-
panic(fmt.Sprintf("git/odb/pack: unknown object type: %d", t))
53+
panic(fmt.Sprintf("gitobj/pack: unknown object type: %d", t))
5454
}
5555

5656
var (
57-
errUnrecognizedObjectType = errors.New("git/odb/pack: unrecognized object type")
57+
errUnrecognizedObjectType = errors.New("gitobj/pack: unrecognized object type")
5858
)

‎pack/type_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ func (c *PackedObjectStringTestCase) Assert(t *testing.T) {
2020
err := recover()
2121

2222
if err == nil {
23-
t.Fatalf("git/odb/pack: expected panic()")
23+
t.Fatalf("gitobj/pack: expected panic()")
2424
}
2525

2626
assert.Equal(t, c.Expected, fmt.Sprintf("%s", err))
@@ -45,7 +45,7 @@ func TestPackedObjectTypeString(t *testing.T) {
4545
Expected: "obj_ref_delta"},
4646

4747
"unknown type": {T: PackedObjectType(5), Panic: true,
48-
Expected: "git/odb/pack: unknown object type: 5"},
48+
Expected: "gitobj/pack: unknown object type: 5"},
4949
} {
5050
t.Run(desc, c.Assert)
5151
}

‎tag.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,14 @@ func (t *Tag) Decode(r io.Reader, size int64) (int, error) {
4343

4444
parts := strings.SplitN(scanner.Text(), " ", 2)
4545
if len(parts) < 2 {
46-
return 0, fmt.Errorf("git/odb: invalid tag header: %s", scanner.Text())
46+
return 0, fmt.Errorf("gitobj: invalid tag header: %s", scanner.Text())
4747
}
4848

4949
switch parts[0] {
5050
case "object":
5151
sha, err := hex.DecodeString(parts[1])
5252
if err != nil {
53-
return 0, fmt.Errorf("git/odb: unable to decode SHA-1: %s", err)
53+
return 0, fmt.Errorf("gitobj: unable to decode SHA-1: %s", err)
5454
}
5555

5656
t.Object = sha
@@ -61,7 +61,7 @@ func (t *Tag) Decode(r io.Reader, size int64) (int, error) {
6161
case "tagger":
6262
t.Tagger = parts[1]
6363
default:
64-
return 0, fmt.Errorf("git/odb: unknown tag header: %s", parts[0])
64+
return 0, fmt.Errorf("gitobj: unknown tag header: %s", parts[0])
6565
}
6666
}
6767
}

‎tree.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ func (e *TreeEntry) Type() ObjectType {
220220
// Safeguard that catch here, or otherwise panic.
221221
return CommitObjectType
222222
} else {
223-
panic(fmt.Sprintf("git/odb: unknown object type: %o",
223+
panic(fmt.Sprintf("gitobj: unknown object type: %o",
224224
e.Filemode))
225225
}
226226
}
@@ -231,7 +231,7 @@ func (e *TreeEntry) Type() ObjectType {
231231
// write trees in a correct, readable format to the Git object database.
232232
//
233233
// The format is as follows: entries are sorted lexicographically in byte-order,
234-
// with subtrees (entries of Type() == git/odb.TreeObjectType) being sorted as
234+
// with subtrees (entries of Type() == gitobj.TreeObjectType) being sorted as
235235
// if their `Name` fields ended in a "/".
236236
//
237237
// See: https://github.com/git/git/blob/v2.13.0/fsck.c#L492-L525 for more

0 commit comments

Comments
 (0)