mistaken merge fix

zeripath · zeripath · commit c0bb1f0fc69f · 2019-12-16T21:55:46.000Z
diff --git a/modules/repofiles/action.go b/modules/repofiles/action.go
@@ -185,6 +185,10 @@ func CommitRepoAction(optsList ...CommitRepoActionOptions) error {
 					return fmt.Errorf("GetRepositoryByName [owner_id: %d, name: %s]: %v", opts.RepoOwnerID, opts.RepoName, err)
 				}
 			}
+			repo, err = models.GetRepositoryByName(opts.RepoOwnerID, opts.RepoName)
+			if err != nil {
+				return fmt.Errorf("GetRepositoryByName [owner_id: %d, name: %s]: %v", opts.RepoOwnerID, opts.RepoName, err)
+			}
 		}
 		refName := git.RefEndName(opts.RefFullName)
 

Original file line number	Diff line number	Diff line change
`@@ -185,6 +185,10 @@ func CommitRepoAction(optsList ...CommitRepoActionOptions) error {`
`185`	`185`	`return fmt.Errorf("GetRepositoryByName [owner_id: %d, name: %s]: %v", opts.RepoOwnerID, opts.RepoName, err)`
`186`	`186`	`}`
`187`	`187`	`}`
	`188`	`+ repo, err = models.GetRepositoryByName(opts.RepoOwnerID, opts.RepoName)`
	`189`	`+ if err != nil {`
	`190`	`+ return fmt.Errorf("GetRepositoryByName [owner_id: %d, name: %s]: %v", opts.RepoOwnerID, opts.RepoName, err)`
	`191`	`+ }`
`188`	`192`	`}`
`189`	`193`	`refName := git.RefEndName(opts.RefFullName)`
`190`	`194`