Skip to content

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

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 6 commits into from
Aug 28, 2025
Merged

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

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
269b30e
Deleting branch could delete broken branch which has database record …
lunny Aug 26, 2025
f10adac
improvements
lunny Aug 27, 2025
130181d
Merge branch 'main' into lunny/fix_possible_broken_branch
lunny Aug 27, 2025
f3bbcdf
Update branch.go
wxiaoguang Aug 28, 2025
f3873be
Update branch.go
wxiaoguang Aug 28, 2025
ab96703
Merge branch 'main' into lunny/fix_possible_broken_branch
lunny Aug 28, 2025
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
44 changes: 27 additions & 17 deletions services/repository/branch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -532,9 +532,14 @@ func DeleteBranch(ctx context.Context, doer *user_model.User, repo *repo_model.R
// database branch record not exist or it's a deleted branch
notExist := git_model.IsErrBranchNotExist(err) || rawBranch.IsDeleted

commit, err := gitRepo.GetBranchCommit(branchName)
if err != nil {
return err
branchExistInGit := gitRepo.IsBranchExist(branchName)
var commitID string
if branchExistInGit {
commit, err := gitRepo.GetBranchCommit(branchName)
if err != nil {
return err
}
commitID = commit.ID.String()
}

if err := db.WithTx(ctx, func(ctx context.Context) error {
Expand All @@ -549,6 +554,9 @@ func DeleteBranch(ctx context.Context, doer *user_model.User, repo *repo_model.R
return fmt.Errorf("DeleteBranch: %v", err)
}
}
if !branchExistInGit {
return nil
}

return gitRepo.DeleteBranch(branchName, git.DeleteBranchOptions{
Force: true,
Expand All @@ -557,20 +565,22 @@ func DeleteBranch(ctx context.Context, doer *user_model.User, repo *repo_model.R
return err
}

objectFormat := git.ObjectFormatFromName(repo.ObjectFormatName)

// Don't return error below this
if err := PushUpdate(
&repo_module.PushUpdateOptions{
RefFullName: git.RefNameFromBranch(branchName),
OldCommitID: commit.ID.String(),
NewCommitID: objectFormat.EmptyObjectID().String(),
PusherID: doer.ID,
PusherName: doer.Name,
RepoUserName: repo.OwnerName,
RepoName: repo.Name,
}); err != nil {
log.Error("Update: %v", err)
if branchExistInGit {
objectFormat := git.ObjectFormatFromName(repo.ObjectFormatName)

// Don't return error below this
if err := PushUpdate(
&repo_module.PushUpdateOptions{
RefFullName: git.RefNameFromBranch(branchName),
OldCommitID: commitID,
NewCommitID: objectFormat.EmptyObjectID().String(),
PusherID: doer.ID,
PusherName: doer.Name,
RepoUserName: repo.OwnerName,
RepoName: repo.Name,
}); err != nil {
log.Error("Update: %v", err)
}
}

return nil
Expand Down