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

Ensure that GitRepo is set on Empty repositories #8539

Merged
merged 3 commits into from
Oct 16, 2019
Merged

Ensure that GitRepo is set on Empty repositories #8539

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5d5df27
Ensure that GitRepo is set on Empty repositories
zeripath Oct 16, 2019
ca83b7a
Merge branch 'master' into fix-8538-set-ctx.repo.GitRepo-on-empty
lafriks Oct 16, 2019
b66d5e8
Merge branch 'master' into fix-8538-set-ctx.repo.GitRepo-on-empty
lunny Oct 16, 2019
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
10 changes: 8 additions & 2 deletions modules/context/repo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,8 +414,8 @@ func RepoAssignment() macaron.Handler {
}
}

// repo is empty and display enable
if ctx.Repo.Repository.IsEmpty || ctx.Repo.Repository.IsBeingCreated() {
// Disable everything when the repo is being created
if ctx.Repo.Repository.IsBeingCreated() {
ctx.Data["BranchName"] = ctx.Repo.Repository.DefaultBranch
return
}
Expand All @@ -427,6 +427,12 @@ func RepoAssignment() macaron.Handler {
}
ctx.Repo.GitRepo = gitRepo

// Stop at this point when the repo is empty.
if ctx.Repo.Repository.IsEmpty {
ctx.Data["BranchName"] = ctx.Repo.Repository.DefaultBranch
return
}

tags, err := ctx.Repo.GitRepo.GetTags()
if err != nil {
ctx.ServerError("GetTags", err)
Expand Down