From c9162b69150d25c4640e6dd0554abc6d06287b92 Mon Sep 17 00:00:00 2001
From: risk danger olson <technoweenie@gmail.com>
Date: Thu, 17 Nov 2016 17:55:06 -0700
Subject: [PATCH] remove WrappedPointer Size, since it embeds Pointer

---
 lfs/gitscanner_catfilebatch.go | 1 -
 lfs/gitscanner_log.go          | 2 +-
 lfs/gitscanner_tree.go         | 1 -
 lfs/scanner.go                 | 2 --
 lfs/scanner_git_test.go        | 6 +++---
 5 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/lfs/gitscanner_catfilebatch.go b/lfs/gitscanner_catfilebatch.go
index 6e235c67..aac69a03 100644
--- a/lfs/gitscanner_catfilebatch.go
+++ b/lfs/gitscanner_catfilebatch.go
@@ -111,7 +111,6 @@ func scanPointer(r *bufio.Reader) (*WrappedPointer, error) {
 		if err == nil {
 			pointer = &WrappedPointer{
 				Sha1:    string(fields[0]),
-				Size:    p.Size,
 				Pointer: p,
 			}
 		}
diff --git a/lfs/gitscanner_log.go b/lfs/gitscanner_log.go
index 1bdb84e6..180e12ea 100644
--- a/lfs/gitscanner_log.go
+++ b/lfs/gitscanner_log.go
@@ -150,7 +150,7 @@ func parseLogOutputToPointers(log io.Reader, dir LogDiffDirection,
 			if currentFileIncluded {
 				p, err := DecodePointer(&pointerData)
 				if err == nil {
-					results <- &WrappedPointer{Name: currentFilename, Size: p.Size, Pointer: p}
+					results <- &WrappedPointer{Name: currentFilename, Pointer: p}
 				} else {
 					tracerx.Printf("Unable to parse pointer from log: %v", err)
 				}
diff --git a/lfs/gitscanner_tree.go b/lfs/gitscanner_tree.go
index 9d6baaa4..cdf719af 100644
--- a/lfs/gitscanner_tree.go
+++ b/lfs/gitscanner_tree.go
@@ -63,7 +63,6 @@ func catFileBatchTree(treeblobs *TreeBlobChannelWrapper) (*PointerChannelWrapper
 			if err == nil {
 				pointers <- &WrappedPointer{
 					Sha1:    string(fields[0]),
-					Size:    p.Size,
 					Pointer: p,
 					Name:    t.Filename,
 				}
diff --git a/lfs/scanner.go b/lfs/scanner.go
index 799dc7fe..79e2ee9e 100644
--- a/lfs/scanner.go
+++ b/lfs/scanner.go
@@ -31,7 +31,6 @@ type WrappedPointer struct {
 	Sha1    string
 	Name    string
 	SrcName string
-	Size    int64
 	Status  string
 	*Pointer
 }
@@ -195,7 +194,6 @@ func ScanIndex(ref string) ([]*WrappedPointer, error) {
 				Name:    file.Name,
 				SrcName: file.SrcName,
 				Status:  file.Status,
-				Size:    p.Size,
 				Pointer: p.Pointer,
 			})
 		}
diff --git a/lfs/scanner_git_test.go b/lfs/scanner_git_test.go
index e787f341..93efa262 100644
--- a/lfs/scanner_git_test.go
+++ b/lfs/scanner_git_test.go
@@ -168,9 +168,9 @@ func TestScanPreviousVersions(t *testing.T) {
 	// folder/nested2.txt [-diff at 3 ie 0]
 	// others are either on diff branches, before this window, or unchanged
 	expected := []*WrappedPointer{
-		{Name: "folder/nested.txt", Size: outputs[3].Files[0].Size, Pointer: outputs[3].Files[0]},
-		{Name: "folder/nested.txt", Size: outputs[0].Files[2].Size, Pointer: outputs[0].Files[2]},
-		{Name: "folder/nested2.txt", Size: outputs[0].Files[3].Size, Pointer: outputs[0].Files[3]},
+		{Name: "folder/nested.txt", Pointer: outputs[3].Files[0]},
+		{Name: "folder/nested.txt", Pointer: outputs[0].Files[2]},
+		{Name: "folder/nested2.txt", Pointer: outputs[0].Files[3]},
 	}
 	// Need to sort to compare equality
 	sort.Sort(test.WrappedPointersByOid(expected))