m79305216
/
gitea
forked from p85947160/gitea
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

work on #1830

This commit is contained in:
Unknwon 2015-10-23 10:31:13 -04:00
parent b5fdf0947b
commit c6ce6bd4c2
5 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gogs.go
View File

@ -17,7 +17,7 @@ import (
"github.com/gogits/gogs/modules/setting"
)
const APP_VER = "0.6.16.1022 Beta"
const APP_VER = "0.6.16.1023 Beta"
func init() {
runtime.GOMAXPROCS(runtime.NumCPU())

4
models/update.go
View File

@ -117,12 +117,12 @@ func Update(refName, oldCommitId, newCommitId, userName, repoUserName, repoName
if isNew {
l, err = newCommit.CommitsBefore()
if err != nil {
return fmt.Errorf("Find CommitsBefore erro: %v", err)
return fmt.Errorf("CommitsBefore: %v", err)
}
} else {
l, err = newCommit.CommitsBeforeUntil(oldCommitId)
if err != nil {
return fmt.Errorf("Find CommitsBeforeUntil erro: %v", err)
return fmt.Errorf("CommitsBeforeUntil: %v", err)
}
}

9
modules/git/repo_commit.go
View File

@ -111,9 +111,9 @@ func (repo *Repository) getCommit(id sha1) (*Commit, error) {
repo.commitCache = make(map[sha1]*Commit, 10)
}
data, bytErr, err := com.ExecCmdDirBytes(repo.Path, "git", "cat-file", "-p", id.String())
data, stderr, err := com.ExecCmdDirBytes(repo.Path, "git", "cat-file", "-p", id.String())
if err != nil {
return nil, errors.New(err.Error() + ": " + string(bytErr))
return nil, concatenateError(err, string(stderr))
}
commit, err := parseCommitData(data)
@ -229,7 +229,7 @@ func (repo *Repository) CommitsBetween(last *Commit, before *Commit) (*list.List
func (repo *Repository) commitsBefore(lock *sync.Mutex, l *list.List, parent *list.Element, id sha1, limit int) error {
commit, err := repo.getCommit(id)
if err != nil {
return err
return fmt.Errorf("getCommit: %v", err)
}
var e *list.Element
@ -301,8 +301,7 @@ func (repo *Repository) CommitsByFileAndRange(branch, file string, page int) (*l
func (repo *Repository) getCommitsBefore(id sha1) (*list.List, error) {
l := list.New()
lock := new(sync.Mutex)
err := repo.commitsBefore(lock, l, nil, id, 0)
return l, err
return l, repo.commitsBefore(lock, l, nil, id, 0)
}
func (repo *Repository) searchCommits(id sha1, keyword string) (*list.List, error) {

2
routers/repo/issue.go
View File

@ -768,7 +768,7 @@ func NewComment(ctx *middleware.Context, form auth.CreateCommentForm) {
var pr *models.PullRequest
if form.Status == "reopen" {
if form.Status == "reopen" && issue.IsPull {
pull := issue.PullRequest
pr, err = models.GetUnmergedPullRequest(pull.HeadRepoID, pull.BaseRepoID, pull.HeadBranch, pull.BaseBranch)
if err != nil {

2
templates/.VERSION
View File

@ -1 +1 @@
0.6.16.1022 Beta
0.6.16.1023 Beta