Fix bug

Author: lunny

services/repository/create.go

@@ -257,7 +257,11 @@ func CreateRepositoryDirectly(ctx context.Context, doer, u *user_model.User, opt
 
 	// last - clean up if something goes wrong
 	// WARNING: Don't override all later err with local variables
-	defer cleanupRepository(err, doer, repo.ID)
+	defer func() {
+		if err != nil {
+			cleanupRepository(doer, repo.ID)
+		}
+	}()
 
 	// No need for init mirror.
 	if opts.IsMirror {
@@ -474,14 +478,12 @@ func CreateRepositoryInDB(ctx context.Context, doer, u *user_model.User, repo *r
 	return nil
 }
 
-func cleanupRepository(err error, doer *user_model.User, repoID int64) {
-	if err != nil {
-		if errDelete := DeleteRepositoryDirectly(db.DefaultContext, doer, repoID); errDelete != nil {
-			log.Error("Rollback deleteRepository: %v", errDelete)
-			// add system notice
-			if err := system_model.CreateRepositoryNotice("DeleteRepositoryDirectly failed when create repository: %v", errDelete); err != nil {
-				log.Error("CreateRepositoryNotice: %v", err)
-			}
+func cleanupRepository(doer *user_model.User, repoID int64) {
+	if errDelete := DeleteRepositoryDirectly(db.DefaultContext, doer, repoID); errDelete != nil {
+		log.Error("Rollback deleteRepository: %v", errDelete)
+		// add system notice
+		if err := system_model.CreateRepositoryNotice("DeleteRepositoryDirectly failed when create repository: %v", errDelete); err != nil {
+			log.Error("CreateRepositoryNotice: %v", err)
 		}
 	}
 }

services/repository/fork.go

@@ -121,7 +121,11 @@ func ForkRepository(ctx context.Context, doer, owner *user_model.User, opts Fork
 
 	// last - clean up if something goes wrong
 	// WARNING: Don't override all later err with local variables
-	defer cleanupRepository(err, doer, repo.ID)
+	defer func() {
+		if err != nil {
+			cleanupRepository(doer, repo.ID)
+		}
+	}()
 
 	// 2 - Clone the repository
 	cloneCmd := git.NewCommand("clone", "--bare")

services/repository/template.go

@@ -112,7 +112,11 @@ func GenerateRepository(ctx context.Context, doer, owner *user_model.User, templ
 	}
 
 	// last - clean up the repository if something goes wrong
-	defer cleanupRepository(err, doer, generateRepo.ID)
+	defer func() {
+		if err != nil {
+			cleanupRepository(doer, generateRepo.ID)
+		}
+	}()
 
 	// 3 - Generate the git repository in storage
 	if err = repo_module.CheckInitRepository(ctx, generateRepo); err != nil {