packfile: add IndexOptions argument to BuildIndex function

Will be used for thin packs. Updates #19
gg-scm · Jan 26, 2021 · c933f0b · c933f0b
1 parent dfac20c
commit c933f0b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/packfile/buildindex.go b/packfile/buildindex.go
@@ -32,9 +32,13 @@ import (
  "gg-scm.io/pkg/git/object"
 )
 
+// IndexOptions holds optional arguments to BuildIndex.
+type IndexOptions struct {
+}
+
 // BuildIndex indexes a packfile. This is equivalent to running git-index-pack(1)
 // on the packfile.
-func BuildIndex(f io.ReaderAt, fileSize int64) (*Index, error) {
+func BuildIndex(f io.ReaderAt, fileSize int64, opts *IndexOptions) (*Index, error) {
  fileHash := sha1.New()
  hashTee := &teeByteReader{
  r: bufio.NewReader(io.NewSectionReader(f, 0, fileSize)),

diff --git a/packfile/buildindex_test.go b/packfile/buildindex_test.go
@@ -40,7 +40,7 @@ func TestBuildIndex(t *testing.T) {
  if err != nil {
  t.Fatal(err)
  }
- got, err := BuildIndex(f, info.Size())
+ got, err := BuildIndex(f, info.Size(), nil)
  if err != nil {
  t.Log("Error:", err)
  if !test.wantError {
@@ -78,7 +78,7 @@ func BenchmarkBuildIndex(b *testing.B) {
  b.ReportAllocs()
  b.ResetTimer()
 
- _, err := BuildIndex(bytes.NewReader(buf.Bytes()), int64(buf.Len()))
+ _, err := BuildIndex(bytes.NewReader(buf.Bytes()), int64(buf.Len()), nil)
  if err != nil {
  b.Fatal(err)
  }

diff --git a/packfile/delta_test.go b/packfile/delta_test.go
@@ -224,7 +224,7 @@ func TestUndeltifier(t *testing.T) {
  if err != nil {
  t.Fatal(err)
  }
- idx, err := BuildIndex(bytes.NewReader(buf.Bytes()), int64(buf.Len()))
+ idx, err := BuildIndex(bytes.NewReader(buf.Bytes()), int64(buf.Len()), nil)
  if err != nil {
  t.Fatal(err)
  }
@@ -257,7 +257,7 @@ func TestUndeltifier(t *testing.T) {
  if err != nil {
  t.Fatal(err)
  }
- idx, err := BuildIndex(bytes.NewReader(buf.Bytes()), int64(buf.Len()))
+ idx, err := BuildIndex(bytes.NewReader(buf.Bytes()), int64(buf.Len()), nil)
  if err != nil {
  t.Fatal(err)
  }