Fix nil reference in repo generation (#9660)

* Fix nil reference Signed-off-by: jolheiser <john.olheiser@gmail.com> * Tighten Signed-off-by: jolheiser <john.olheiser@gmail.com>
5 years ago · ee9ce0cfa9
parent 25531c71a7
commit ee9ce0cfa9
1 changed files with 31 additions and 29 deletions
--- a/models/repo_generate.go
+++ b/models/repo_generate.go
@ -124,6 +124,7 @@ func generateRepoCommit(e Engine, repo, templateRepo, generateRepo *Repository,
 		return fmt.Errorf("checkGiteaTemplate: %v", err)
 	}

+	if gt != nil {
 		if err := os.Remove(gt.Path); err != nil {
 			return fmt.Errorf("remove .giteatemplate: %v", err)
 		}
@ -161,6 +162,7 @@ func generateRepoCommit(e Engine, repo, templateRepo, generateRepo *Repository,
 				return err
 			}
 		}
+	}

 	if err := git.InitRepository(tmpDir, false); err != nil {
 		return err