Skip to content

fix calReleaseNumCommitsBehind #24148

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 10 commits into from
Apr 18, 2023
Merged

fix calReleaseNumCommitsBehind #24148

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b09aa8d
fix calReleaseNumCommitsBehind
oliverpool Apr 15, 2023
8e2deec
tests: add dedicated repo-release repository
oliverpool Apr 17, 2023
97c2380
fix unrelated tests
oliverpool Apr 17, 2023
334f230
add missing repo_unit
oliverpool Apr 17, 2023
17e0b32
Merge branch 'main' into fix_calReleaseNumCommitsBehind
oliverpool Apr 17, 2023
d325ef3
fix mysql tests
oliverpool Apr 17, 2023
ab245bb
Merge branch 'main' into fix_calReleaseNumCommitsBehind
GiteaBot Apr 18, 2023
d4537d9
Merge branch 'main' into fix_calReleaseNumCommitsBehind
lunny Apr 18, 2023
d627609
Merge branch 'main' into fix_calReleaseNumCommitsBehind
GiteaBot Apr 18, 2023
5848c92
Merge branch 'main' into fix_calReleaseNumCommitsBehind
GiteaBot Apr 18, 2023
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: 2 additions & 7 deletions routers/web/repo/release.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,10 @@ const (

// calReleaseNumCommitsBehind calculates given release has how many commits behind release target.
func calReleaseNumCommitsBehind(repoCtx *context.Repository, release *repo_model.Release, countCache map[string]int64) error {
// Fast return if release target is same as default branch.
if repoCtx.BranchName == release.Target {
release.NumCommitsBehind = repoCtx.CommitsCount - release.NumCommits
return nil
}

// Get count if not exists
if _, ok := countCache[release.Target]; !ok {
if repoCtx.GitRepo.IsBranchExist(release.Target) {
// short-circuit for the default branch
if repoCtx.Repository.DefaultBranch == release.Target || repoCtx.GitRepo.IsBranchExist(release.Target) {
commit, err := repoCtx.GitRepo.GetBranchCommit(release.Target)
if err != nil {
return fmt.Errorf("GetBranchCommit: %w", err)
Expand Down