From f9ec2f89f2265bc1371a6c62359de9816534fa6b Mon Sep 17 00:00:00 2001
From: kolaente <konrad@kola-entertainments.de>
Date: Wed, 12 Jun 2019 21:41:28 +0200
Subject: Add golangci (#6418)

---
 modules/repofiles/upload.go | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'modules/repofiles/upload.go')

diff --git a/modules/repofiles/upload.go b/modules/repofiles/upload.go
index 5f428c3139..2da101c64d 100644
--- a/modules/repofiles/upload.go
+++ b/modules/repofiles/upload.go
@@ -57,10 +57,10 @@ func UploadRepoFiles(repo *models.Repository, doer *models.User, opts *UploadRep
 	}
 
 	t, err := NewTemporaryUploadRepository(repo)
-	defer t.Close()
 	if err != nil {
 		return err
 	}
+	defer t.Close()
 	if err := t.Clone(opts.OldBranch); err != nil {
 		return err
 	}
@@ -108,10 +108,8 @@ func UploadRepoFiles(repo *models.Repository, doer *models.User, opts *UploadRep
 			}
 			infos[i] = uploadInfo
 
-		} else {
-			if objectHash, err = t.HashObject(file); err != nil {
-				return err
-			}
+		} else if objectHash, err = t.HashObject(file); err != nil {
+			return err
 		}
 
 		// Add the object to the index
-- 
cgit v1.2.3