forked from gitea/gitea
Fix #515
This commit is contained in:
parent
198567eccb
commit
2a031c1365
2
gogs.go
2
gogs.go
|
@ -17,7 +17,7 @@ import (
|
||||||
"github.com/gogits/gogs/modules/setting"
|
"github.com/gogits/gogs/modules/setting"
|
||||||
)
|
)
|
||||||
|
|
||||||
const APP_VER = "0.5.4.0929 Beta"
|
const APP_VER = "0.5.4.0930 Beta"
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
runtime.GOMAXPROCS(runtime.NumCPU())
|
runtime.GOMAXPROCS(runtime.NumCPU())
|
||||||
|
|
|
@ -40,11 +40,11 @@ func (repo *Repository) GetCommitIdOfTag(tagName string) (string, error) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (repo *Repository) GetCommitOfTag(tagName string) (*Commit, error) {
|
func (repo *Repository) GetCommitOfTag(tagName string) (*Commit, error) {
|
||||||
commitId, err := repo.GetCommitIdOfTag(tagName)
|
tag, err := repo.GetTag(tagName)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
return repo.GetCommit(commitId)
|
return tag.Commit()
|
||||||
}
|
}
|
||||||
|
|
||||||
// Parse commit information from the (uncompressed) raw
|
// Parse commit information from the (uncompressed) raw
|
||||||
|
|
|
@ -52,6 +52,7 @@ func (repo *Repository) getTag(id sha1) (*Tag, error) {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, errors.New(stderr)
|
return nil, errors.New(stderr)
|
||||||
}
|
}
|
||||||
|
tp = strings.TrimSpace(tp)
|
||||||
|
|
||||||
// Tag is a commit.
|
// Tag is a commit.
|
||||||
if ObjectType(tp) == COMMIT {
|
if ObjectType(tp) == COMMIT {
|
||||||
|
@ -77,7 +78,6 @@ func (repo *Repository) getTag(id sha1) (*Tag, error) {
|
||||||
}
|
}
|
||||||
|
|
||||||
tag.Id = id
|
tag.Id = id
|
||||||
tag.Object = id
|
|
||||||
tag.repo = repo
|
tag.repo = repo
|
||||||
|
|
||||||
repo.tagCache[id] = tag
|
repo.tagCache[id] = tag
|
||||||
|
|
|
@ -109,9 +109,12 @@ func (t *Tree) ListEntries(relpath string) (Entries, error) {
|
||||||
}
|
}
|
||||||
t.entriesParsed = true
|
t.entriesParsed = true
|
||||||
|
|
||||||
stdout, _, err := com.ExecCmdDirBytes(t.repo.Path,
|
stdout, stderr, err := com.ExecCmdDirBytes(t.repo.Path,
|
||||||
"git", "ls-tree", t.Id.String())
|
"git", "ls-tree", t.Id.String())
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
if strings.Contains(err.Error(), "exit status 128") {
|
||||||
|
return nil, errors.New(strings.TrimSpace(string(stderr)))
|
||||||
|
}
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
t.entries, err = parseTreeData(t, stdout)
|
t.entries, err = parseTreeData(t, stdout)
|
||||||
|
|
|
@ -208,10 +208,9 @@ func RepoAssignment(redirect bool, args ...bool) macaron.Handler {
|
||||||
} else if gitRepo.IsTagExist(refName) {
|
} else if gitRepo.IsTagExist(refName) {
|
||||||
ctx.Repo.IsTag = true
|
ctx.Repo.IsTag = true
|
||||||
ctx.Repo.BranchName = refName
|
ctx.Repo.BranchName = refName
|
||||||
|
ctx.Repo.Commit, err = ctx.Repo.GitRepo.GetCommitOfTag(refName)
|
||||||
ctx.Repo.Commit, err = gitRepo.GetCommitOfTag(refName)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
ctx.Handle(500, "RepoAssignment invalid tag", err)
|
ctx.Handle(500, "Fail to get tag commit", err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
ctx.Repo.CommitId = ctx.Repo.Commit.Id.String()
|
ctx.Repo.CommitId = ctx.Repo.Commit.Id.String()
|
||||||
|
|
|
@ -833,7 +833,6 @@ ol.linenums {
|
||||||
}
|
}
|
||||||
#dashboard-my-repo .repo-count {
|
#dashboard-my-repo .repo-count {
|
||||||
margin-left: 4px;
|
margin-left: 4px;
|
||||||
font-size: .8em;
|
|
||||||
}
|
}
|
||||||
#dashboard-my-org,
|
#dashboard-my-org,
|
||||||
#dashboard-my-mirror {
|
#dashboard-my-mirror {
|
||||||
|
|
|
@ -139,7 +139,6 @@
|
||||||
}
|
}
|
||||||
.repo-count {
|
.repo-count {
|
||||||
margin-left: 4px;
|
margin-left: 4px;
|
||||||
font-size: .8em;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#dashboard-my-org,
|
#dashboard-my-org,
|
||||||
|
|
|
@ -118,6 +118,7 @@ func Home(ctx *middleware.Context) {
|
||||||
ctx.Handle(404, "SubTree", err)
|
ctx.Handle(404, "SubTree", err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
entries, err := tree.ListEntries(treename)
|
entries, err := tree.ListEntries(treename)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
ctx.Handle(500, "ListEntries", err)
|
ctx.Handle(500, "ListEntries", err)
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
0.5.4.0929 Beta
|
0.5.4.0930 Beta
|
Loading…
Reference in New Issue