From d52b1880ae07bd8a989448502f780d0e258e9201 Mon Sep 17 00:00:00 2001 From: Lars Schneider Date: Mon, 6 Jul 2015 13:13:57 +0200 Subject: [PATCH] Remove unnecessary parameters from NewUploadable function. --- commands/command_pre_push.go | 4 ++-- commands/command_push.go | 4 ++-- lfs/upload_queue.go | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/commands/command_pre_push.go b/commands/command_pre_push.go index e878b148..9afc3ecd 100644 --- a/commands/command_pre_push.go +++ b/commands/command_pre_push.go @@ -73,13 +73,13 @@ func prePushCommand(cmd *cobra.Command, args []string) { uploadQueue := lfs.NewUploadQueue(lfs.Config.ConcurrentTransfers(), len(pointers)) - for i, pointer := range pointers { + for _, pointer := range pointers { if prePushDryRun { Print("push %s", pointer.Name) continue } - u, wErr := lfs.NewUploadable(pointer.Oid, pointer.Name, i+1, len(pointers)) + u, wErr := lfs.NewUploadable(pointer.Oid, pointer.Name) if wErr != nil { if Debugging || wErr.Panic { Panic(wErr.Err, wErr.Error()) diff --git a/commands/command_push.go b/commands/command_push.go index 519e0f59..af6d2a7e 100644 --- a/commands/command_push.go +++ b/commands/command_push.go @@ -41,7 +41,7 @@ func uploadsBetweenRefs(left string, right string) *lfs.TransferQueue { } tracerx.Printf("checking_asset: %s %s %d/%d", pointer.Oid, pointer.Name, i+1, len(pointers)) - u, wErr := lfs.NewUploadable(pointer.Oid, pointer.Name, i+1, len(pointers)) + u, wErr := lfs.NewUploadable(pointer.Oid, pointer.Name) if wErr != nil { if Debugging || wErr.Panic { Panic(wErr.Err, wErr.Error()) @@ -59,7 +59,7 @@ func uploadsWithObjectIDs(oids []string) *lfs.TransferQueue { uploadQueue := lfs.NewUploadQueue(lfs.Config.ConcurrentTransfers(), len(oids)) for _, oid := range oids { - u, wErr := lfs.NewUploadable(oid, "", 0, 0) + u, wErr := lfs.NewUploadable(oid, "") if wErr != nil { if Debugging || wErr.Panic { Panic(wErr.Err, wErr.Error()) diff --git a/lfs/upload_queue.go b/lfs/upload_queue.go index 6af350c1..389d1700 100644 --- a/lfs/upload_queue.go +++ b/lfs/upload_queue.go @@ -17,7 +17,7 @@ type Uploadable struct { // NewUploadable builds the Uploadable from the given information. // "filename" can be empty if a raw object is pushed (see "object-id" flag in push command)/ -func NewUploadable(oid, filename string, index, totalFiles int) (*Uploadable, *WrappedError) { +func NewUploadable(oid, filename string) (*Uploadable, *WrappedError) { localMediaPath, err := LocalMediaPath(oid) if err != nil { return nil, Errorf(err, "Error uploading file %s (%s)", filename, oid)