Commit 7636d58

lunnywxiaoguang

and

authored

Deleting branch could delete broken branch which has database record but git branch is missing (#35360)

For some reasons, branches between database and git are not synced. If a branch exists in database but not in the git, it should be able to be deleted. --------- Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>

1 parent 0cbaa0b commit 7636d58Copy full SHA for 7636d58

File tree

1 file changed

+12

-5

lines changed

services/repository
- branch.go

1 file changed

+12

-5

lines changed

`‎services/repository/branch.go`

Lines changed: 12 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -532,8 +532,8 @@ func DeleteBranch(ctx context.Context, doer user_model.User, repo repo_model.R`
`532`	`532`	`// database branch record not exist or it's a deleted branch`
`533`	`533`	`notExist := git_model.IsErrBranchNotExist(err) \|\| rawBranch.IsDeleted`
`534`	`534`
`535`		`- commit, err := gitRepo.GetBranchCommit(branchName)`
`536`		`- if err != nil {`
	`535`	`+ branchCommit, err := gitRepo.GetBranchCommit(branchName)`
	`536`	`+ if err != nil &&!errors.Is(err, util.ErrNotExist) {`
`537`	`537`	`return err`
`538`	`538`	`}`
`539`	`539`
`@@ -549,6 +549,9 @@ func DeleteBranch(ctx context.Context, doer user_model.User, repo repo_model.R`
`549`	`549`	`return fmt.Errorf("DeleteBranch: %v", err)`
`550`	`550`	`}`
`551`	`551`	`}`
	`552`	`+ if branchCommit == nil {`
	`553`	`+ return nil`
	`554`	`+ }`
`552`	`555`
`553`	`556`	`return gitRepo.DeleteBranch(branchName, git.DeleteBranchOptions{`
`554`	`557`	`Force: true,`
`@@ -557,20 +560,24 @@ func DeleteBranch(ctx context.Context, doer user_model.User, repo repo_model.R`
`557`	`560`	`return err`
`558`	`561`	`}`
`559`	`562`
`560`		`- objectFormat := git.ObjectFormatFromName(repo.ObjectFormatName)`
	`563`	`+ if branchCommit == nil {`
	`564`	`+ return nil`
	`565`	`+ }`
`561`	`566`
`562`	`567`	`// Don't return error below this`
	`568`	`+`
	`569`	`+ objectFormat := git.ObjectFormatFromName(repo.ObjectFormatName)`
`563`	`570`	`if err := PushUpdate(`
`564`	`571`	`&repo_module.PushUpdateOptions{`
`565`	`572`	`RefFullName: git.RefNameFromBranch(branchName),`
`566`		`- OldCommitID: commit.ID.String(),`
	`573`	`+ OldCommitID: branchCommit.ID.String(),`
`567`	`574`	`NewCommitID: objectFormat.EmptyObjectID().String(),`
`568`	`575`	`PusherID: doer.ID,`
`569`	`576`	`PusherName: doer.Name,`
`570`	`577`	`RepoUserName: repo.OwnerName,`
`571`	`578`	`RepoName: repo.Name,`
`572`	`579`	`}); err != nil {`
`573`		`- log.Error("Update: %v", err)`
	`580`	`+ log.Error("PushUpdateOptions: %v", err)`
`574`	`581`	`}`
`575`	`582`
`576`	`583`	`return nil`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit 7636d58

File tree

1 file changed

1 file changed

`‎services/repository/branch.go`

0 commit comments