Docker/forgejo
Docker/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2025-08-02 16:35:19 +02:00
Code Issues Releases Activity

chore(cleanup): GitRepo.GetCommit is equivalent to GitRepo.IsBranchExist

Browse source 
Since go-git was dropped in a21128a734,
IsBranchExist relies on git-cat-file to figure out if a commit ID
exists.

There is no need to fallback to GetCommit if IsBranchExist determines
the commit does not exist and it will come to the same conclusion.
This commit is contained in:
Earl Warren 2025-06-28 18:43:06 +02:00
parent d6e4342353
commit a300c0b9fd
No known key found for this signature in database
GPG key ID: 0579CB2928A78A00
2 changed files with 8 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

19
routers/api/v1/repo/pull.go
View file

@ -1116,13 +1116,8 @@ func parseCompareInfo(ctx *context.APIContext, form api.CreatePullRequestOption)
baseIsBranch := ctx.Repo.GitRepo.IsBranchExist(baseBranch)
baseIsTag := ctx.Repo.GitRepo.IsTagExist(baseBranch)
if !baseIsCommit && !baseIsBranch && !baseIsTag {
// Check for short SHA usage
if baseCommit, _ := ctx.Repo.GitRepo.GetCommit(baseBranch); baseCommit != nil {
baseBranch = baseCommit.ID.String()
} else {
ctx.NotFound("BaseNotExist")
return nil, nil, nil, "", ""
}
ctx.NotFound("BaseNotExist")
return nil, nil, nil, "", ""
}
headRepo := repo_model.GetForkedRepo(ctx, headUser.ID, baseRepo.ID)
@ -1203,14 +1198,8 @@ func parseCompareInfo(ctx *context.APIContext, form api.CreatePullRequestOption)
headIsBranch := headGitRepo.IsBranchExist(headBranch)
headIsTag := headGitRepo.IsTagExist(headBranch)
if !headIsCommit && !headIsBranch && !headIsTag {
// Check if headBranch is short sha commit hash
if headCommit, _ := headGitRepo.GetCommit(headBranch); headCommit != nil {
headBranch = headCommit.ID.String()
} else {
headGitRepo.Close()
ctx.NotFound("IsRefExist", nil)
return nil, nil, nil, "", ""
}
ctx.NotFound("IsRefExist", nil)
return nil, nil, nil, "", ""
}
headBranchRef := headBranch