lfs: don't close pointer scanner on error

On error, we used to attempt to close the pointer scanner to free the resources that were associated with git cat-file --batch. However, now that we're using a gitobj-based scanner, there are no resources of that kind to free. Moreover, we only return an error if we return nil for the scanner object, so attempting to close the scanner leads to a nil pointer dereference. Remove the calls to close the scanner when an error occurs. Signed-off-by: brian m. carlson <[email protected]>
slavamirovsky · Nov 16, 2018 · 7dae495 · 7dae495
1 parent c825e5a
commit 7dae495
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 4 deletions.
diff --git a/commands/command_status.go b/commands/command_status.go
@@ -34,8 +34,6 @@ func statusCommand(cmd *cobra.Command, args []string) {
 
 	scanner, err := lfs.NewPointerScanner()
 	if err != nil {
-		scanner.Close()
-
 		ExitWithError(err)
 	}
 

diff --git a/lfs/gitscanner_tree.go b/lfs/gitscanner_tree.go
@@ -49,8 +49,6 @@ func runScanTree(cb GitScannerFoundPointer, ref string, filter *filepathfilter.F
 func catFileBatchTree(treeblobs *TreeBlobChannelWrapper) (*PointerChannelWrapper, error) {
 	scanner, err := NewPointerScanner()
 	if err != nil {
-		scanner.Close()
-
 		return nil, err
 	}