Skip to content

fix(api): refactor branch and tag existence checks #30618

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Apr 21, 2024
Merged

fix(api): refactor branch and tag existence checks #30618

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e9e900e
fix: refactor branch and tag existence checks
appleboy Apr 20, 2024
0ca2063
Update routers/api/v1/repo/pull.go
appleboy Apr 21, 2024
ac89a5f
Merge branch 'main' into compare
appleboy Apr 21, 2024
f2bce98
Update pull.go
wxiaoguang Apr 21, 2024
2a1d2ac
Merge branch 'main' into compare
GiteaBot Apr 21, 2024
1ef7ed0
Merge branch 'main' into compare
GiteaBot Apr 21, 2024
2e7ac9d
Merge branch 'main' into compare
GiteaBot Apr 21, 2024
df7286d
Merge branch 'main' into compare
GiteaBot Apr 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions routers/api/v1/repo/pull.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1082,11 +1082,10 @@ func parseCompareInfo(ctx *context.APIContext, form api.CreatePullRequestOption)
}

ctx.Repo.PullRequest.SameRepo = isSameRepo
log.Info("Base branch: %s", baseBranch)
log.Info("Repo path: %s", ctx.Repo.GitRepo.Path)
log.Trace("Repo path: %q, base branch: %q, head branch: %q", ctx.Repo.GitRepo.Path, baseBranch, headBranch)
// Check if base branch is valid.
if !ctx.Repo.GitRepo.IsBranchExist(baseBranch) {
ctx.NotFound("IsBranchExist")
if !ctx.Repo.GitRepo.IsBranchExist(baseBranch) && !ctx.Repo.GitRepo.IsTagExist(baseBranch) {
ctx.NotFound("BaseNotExist")
return nil, nil, nil, nil, "", ""
}

Expand Down Expand Up @@ -1149,7 +1148,7 @@ func parseCompareInfo(ctx *context.APIContext, form api.CreatePullRequestOption)
}

// Check if head branch is valid.
if !headGitRepo.IsBranchExist(headBranch) {
if !headGitRepo.IsBranchExist(headBranch) && !headGitRepo.IsTagExist(headBranch) {
headGitRepo.Close()
ctx.NotFound()
return nil, nil, nil, nil, "", ""
Expand Down