Skip to content
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

Jump to bottom

Fix PATCH /repos/{owner}/{repo} panic #14637

Merged
merged 8 commits into from
Feb 11, 2021
Merged

Fix PATCH /repos/{owner}/{repo} panic #14637

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
50996b8
Fix a runtime error when modifying a repository through API call
Feb 10, 2021
c58f313
Merge branch 'master' into fix_patch_default_branch_panic
Feb 10, 2021
be5c83a
Apply suggestions from code review
6543 Feb 11, 2021
4f1711e
Apply suggestions from code review
6543 Feb 11, 2021
c3068b1
Merge branch 'master' into fix_patch_default_branch_panic
6543 Feb 11, 2021
bf4164a
Ensure that the git repository is loaded
zeripath Feb 11, 2021
28c47f9
Allow empty repos to have their default branches changed
zeripath Feb 11, 2021
949ed90
Merge branch 'master' into fix_patch_default_branch_panic
zeripath Feb 11, 2021
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
16 changes: 14 additions & 2 deletions routers/api/v1/repo/repo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -574,8 +574,20 @@ func updateBasicProperties(ctx *context.APIContext, opts api.EditRepoOption) err
repo.IsTemplate = *opts.Template
}

// Default branch only updated if changed and exist
if opts.DefaultBranch != nil && repo.DefaultBranch != *opts.DefaultBranch && ctx.Repo.GitRepo.IsBranchExist(*opts.DefaultBranch) {
if ctx.Repo.GitRepo == nil {
var err error
ctx.Repo.GitRepo, err = git.OpenRepository(ctx.Repo.Repository.RepoPath())
if err != nil {
ctx.Error(http.StatusInternalServerError, "Unable to OpenRepository", err)
return err
}
defer ctx.Repo.GitRepo.Close()
}

// Default branch only updated if changed and exist or the repository is empty
if opts.DefaultBranch != nil &&
repo.DefaultBranch != *opts.DefaultBranch &&
(ctx.Repo.Repository.IsEmpty || ctx.Repo.GitRepo.IsBranchExist(*opts.DefaultBranch)) {
if err := ctx.Repo.GitRepo.SetDefaultBranch(*opts.DefaultBranch); err != nil {
if !git.IsErrUnsupportedVersion(err) {
ctx.Error(http.StatusInternalServerError, "SetDefaultBranch", err)
Expand Down