Skip to content

Commit

Permalink
Fixed if statement to correctly check base repository
Browse files Browse the repository at this point in the history
  • Loading branch information
LordChunk committed Aug 19, 2024
1 parent e1e3c06 commit 821300b
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions routers/api/v1/repo/pull.go
Original file line number Diff line number Diff line change
Expand Up @@ -1110,18 +1110,20 @@ func parseCompareInfo(ctx *context.APIContext, form api.CreatePullRequestOption)
// Check if current user has fork of repository or in the same repository.
headRepo := repo_model.GetForkedRepo(ctx, headUser.ID, baseRepo.ID)
if headRepo == nil && !isSameRepo {
// Check if the base repository is a fork of the head repository.
headRepo, err = repo_model.GetRepositoryByID(ctx, baseRepo.ForkID)
err := baseRepo.GetBaseRepo(ctx)
if err != nil {
ctx.Error(http.StatusInternalServerError, "GetRepositoryByID", err)
ctx.Error(http.StatusInternalServerError, "GetBaseRepo", err)
return nil, nil, nil, "", ""
}

if headRepo == nil {
// Check if baseRepo's base repository is the same as headUser's repository.
if baseRepo.BaseRepo == nil || baseRepo.BaseRepo.OwnerID != headUser.ID {
log.Trace("parseCompareInfo[%d]: does not have fork or in same repository", baseRepo.ID)
ctx.NotFound("GetForkedRepo")
ctx.NotFound("GetBaseRepo")
return nil, nil, nil, "", ""
}
// Assign headRepo so it can be used below.
headRepo = baseRepo.BaseRepo
}

var headGitRepo *git.Repository
Expand Down

0 comments on commit 821300b

Please sign in to comment.