Skip to content

Commit c015839

Browse files
committed
Fix full pushing environment
1 parent 172cf28 commit c015839

File tree

1 file changed

+11
-1
lines changed

1 file changed

+11
-1
lines changed

modules/pull/merge.go

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,17 @@ func Merge(pr *models.PullRequest, doer *models.User, baseGitRepo *git.Repositor
231231
}
232232
}
233233

234-
env := models.FullPushingEnvironment(pr.HeadUserName, doer, pr.BaseRepo)
234+
headUser, err := models.GetUserByName(pr.HeadUserName)
235+
if err != nil {
236+
if !models.IsErrUserNotExist(err) {
237+
log.Error("Can't find user: %s for head repository - %v", pr.HeadUserName, err)
238+
return err
239+
}
240+
log.Error("Can't find user: %s for head repository - defaulting to doer: %s - %v", pr.HeadUserName, doer.Name, err)
241+
headUser = doer
242+
}
243+
244+
env := models.FullPushingEnvironment(headUser, doer, pr.BaseRepo, pr.ID)
235245

236246
// Push back to upstream.
237247
if err := git.NewCommand("push", "origin", pr.BaseBranch).RunInDirTimeoutEnvPipeline(env, -1, tmpBasePath, nil, &errbuf); err != nil {

0 commit comments

Comments
 (0)