From 99e9bbef6c291e983ec919406ed50a91b929c34c Mon Sep 17 00:00:00 2001 From: Unknwon Date: Thu, 10 Dec 2015 16:27:47 -0500 Subject: fix bool check for repo max limit and fix hang when push repo with tons of commits --- models/action.go | 4 ---- models/update.go | 4 ++-- models/user.go | 3 +++ 3 files changed, 5 insertions(+), 6 deletions(-) (limited to 'models') diff --git a/models/action.go b/models/action.go index 2c8eed85f2..89003214dd 100644 --- a/models/action.go +++ b/models/action.go @@ -440,10 +440,6 @@ func CommitRepoAction( isNewBranch = true } - // NOTE: limit to detect latest 100 commits. - if len(commit.Commits) > 100 { - commit.Commits = commit.Commits[len(commit.Commits)-100:] - } if err = updateIssuesCommit(u, repo, repoUserName, repoName, commit.Commits); err != nil { log.Error(4, "updateIssuesCommit: %v", err) } diff --git a/models/update.go b/models/update.go index 9878f04a07..0c4d342d01 100644 --- a/models/update.go +++ b/models/update.go @@ -10,7 +10,7 @@ import ( "os/exec" "strings" - "github.com/gogits/git-shell" + git "github.com/gogits/git-shell" "github.com/gogits/gogs/modules/log" ) @@ -135,7 +135,7 @@ func Update(refName, oldCommitID, newCommitID, userName, repoUserName, repoName // Push new branch. var l *list.List if isNew { - l, err = newCommit.CommitsBefore() + l, err = newCommit.CommitsBeforeLimit(10) if err != nil { return fmt.Errorf("CommitsBefore: %v", err) } diff --git a/models/user.go b/models/user.go index 2806ef64ed..8993d7de3c 100644 --- a/models/user.go +++ b/models/user.go @@ -133,6 +133,9 @@ func (u *User) RepoCreationNum() int { func (u *User) CanCreateRepo() bool { if u.MaxRepoCreation <= -1 { + if setting.Repository.MaxCreationLimit == -1 { + return true + } return u.NumRepos < setting.Repository.MaxCreationLimit } return u.NumRepos < u.MaxRepoCreation -- cgit v1.2.3