lavender-legacy
/
gitea
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1829 from ethantkoenig/no_branches 

Commitless repos should be bare
release/v1.15
Andrey Nering 2017-06-12 11:05:01 -03:00 committed by GitHub
parent b5d2780b22 c85ff532e9
commit 635273cea6
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
models/action.go
View File

@ -517,7 +517,7 @@ func CommitRepoAction(opts CommitRepoActionOptions) error {
} }
// Change repository bare status and update last updated time. // Change repository bare status and update last updated time.
repo.IsBare = false repo.IsBare = repo.IsBare && opts.Commits.Len <= 0
if err = UpdateRepository(repo, false); err != nil { if err = UpdateRepository(repo, false); err != nil {
return fmt.Errorf("UpdateRepository: %v", err) return fmt.Errorf("UpdateRepository: %v", err)
} }

4
modules/context/repo.go
View File

@ -390,6 +390,10 @@ func RepoRef() macaron.Handler {
if err != nil { if err != nil {
ctx.Handle(500, "GetBranches", err) ctx.Handle(500, "GetBranches", err)
return return
} else if len(brs) == 0 {
err = fmt.Errorf("No branches in non-bare repository %s",
ctx.Repo.GitRepo.Path)
ctx.Handle(500, "GetBranches", err)
} }
refName = brs[0] refName = brs[0]
} }