diff options
| author | ferhat elmas <elmas.ferhat@gmail.com> | 2017-11-29 02:24:31 +0100 |
|---|---|---|
| committer | ferhat elmas <elmas.ferhat@gmail.com> | 2017-11-29 13:01:32 +0100 |
| commit | 18e6f9daa3899318d36b525b068837f49bc2c1cf (patch) | |
| tree | a797b79d0a750972ba9809eb52691cb09f9b6383 /plumbing/format/packfile | |
| parent | c07c778ed043429427533e2fd7549a3d54b903f1 (diff) | |
| download | go-git-18e6f9daa3899318d36b525b068837f49bc2c1cf.tar.gz | |
all: simplification
- no length for map initialization
- don't check for boolean/error return
- don't format string
- use string method of bytes buffer instead of converting bytes to
string
- use `strings.Contains` instead of `strings.Index`
- use `bytes.Equal` instead of `bytes.Compare`
Diffstat (limited to 'plumbing/format/packfile')
| -rw-r--r-- | plumbing/format/packfile/decoder.go | 2 | ||||
| -rw-r--r-- | plumbing/format/packfile/delta_index.go | 4 | ||||
| -rw-r--r-- | plumbing/format/packfile/object_pack.go | 6 | ||||
| -rw-r--r-- | plumbing/format/packfile/patch_delta.go | 7 |
4 files changed, 5 insertions, 14 deletions
diff --git a/plumbing/format/packfile/decoder.go b/plumbing/format/packfile/decoder.go index 26a2a01..ad72ea0 100644 --- a/plumbing/format/packfile/decoder.go +++ b/plumbing/format/packfile/decoder.go @@ -105,7 +105,7 @@ func NewDecoderForType(s *Scanner, o storer.EncodedObjectStorer, o: o, idx: NewIndex(0), - offsetToType: make(map[int64]plumbing.ObjectType, 0), + offsetToType: make(map[int64]plumbing.ObjectType), decoderType: t, }, nil } diff --git a/plumbing/format/packfile/delta_index.go b/plumbing/format/packfile/delta_index.go index 349bedf..07a6112 100644 --- a/plumbing/format/packfile/delta_index.go +++ b/plumbing/format/packfile/delta_index.go @@ -215,12 +215,10 @@ var len8tab = [256]uint8{ } func hashBlock(raw []byte, ptr int) int { - var hash uint32 - // The first 4 steps collapse out into a 4 byte big-endian decode, // with a larger right shift as we combined shift lefts together. // - hash = ((uint32(raw[ptr]) & 0xff) << 24) | + hash := ((uint32(raw[ptr]) & 0xff) << 24) | ((uint32(raw[ptr+1]) & 0xff) << 16) | ((uint32(raw[ptr+2]) & 0xff) << 8) | (uint32(raw[ptr+3]) & 0xff) diff --git a/plumbing/format/packfile/object_pack.go b/plumbing/format/packfile/object_pack.go index 14337d1..e22e783 100644 --- a/plumbing/format/packfile/object_pack.go +++ b/plumbing/format/packfile/object_pack.go @@ -84,11 +84,7 @@ func (o *ObjectToPack) Size() int64 { } func (o *ObjectToPack) IsDelta() bool { - if o.Base != nil { - return true - } - - return false + return o.Base != nil } func (o *ObjectToPack) SetDelta(base *ObjectToPack, delta plumbing.EncodedObject) { diff --git a/plumbing/format/packfile/patch_delta.go b/plumbing/format/packfile/patch_delta.go index 976cabc..c604851 100644 --- a/plumbing/format/packfile/patch_delta.go +++ b/plumbing/format/packfile/patch_delta.go @@ -38,11 +38,8 @@ func ApplyDelta(target, base plumbing.EncodedObject, delta []byte) error { target.SetSize(int64(len(dst))) - if _, err := w.Write(dst); err != nil { - return err - } - - return nil + _, err = w.Write(dst) + return err } var ( |