diff options
| -rw-r--r-- | gogs.go | 2 | ||||
| -rw-r--r-- | modules/git/repo_commit.go | 4 | ||||
| -rw-r--r-- | modules/git/repo_tag.go | 2 | ||||
| -rw-r--r-- | modules/git/tree.go | 5 | ||||
| -rw-r--r-- | modules/middleware/repo.go | 5 | ||||
| -rw-r--r-- | public/ng/css/gogs.css | 1 | ||||
| -rw-r--r-- | public/ng/less/gogs/dashboard.less | 1 | ||||
| -rw-r--r-- | routers/repo/view.go | 1 | ||||
| -rw-r--r-- | templates/.VERSION | 2 |
9 files changed, 12 insertions, 11 deletions
@@ -17,7 +17,7 @@ import ( "github.com/gogits/gogs/modules/setting" ) -const APP_VER = "0.5.4.0929 Beta" +const APP_VER = "0.5.4.0930 Beta" func init() { runtime.GOMAXPROCS(runtime.NumCPU()) diff --git a/modules/git/repo_commit.go b/modules/git/repo_commit.go index cd0181c481..7c47b53dc4 100644 --- a/modules/git/repo_commit.go +++ b/modules/git/repo_commit.go @@ -40,11 +40,11 @@ func (repo *Repository) GetCommitIdOfTag(tagName string) (string, error) { } func (repo *Repository) GetCommitOfTag(tagName string) (*Commit, error) { - commitId, err := repo.GetCommitIdOfTag(tagName) + tag, err := repo.GetTag(tagName) if err != nil { return nil, err } - return repo.GetCommit(commitId) + return tag.Commit() } // Parse commit information from the (uncompressed) raw diff --git a/modules/git/repo_tag.go b/modules/git/repo_tag.go index dd31e4414f..77ae3db007 100644 --- a/modules/git/repo_tag.go +++ b/modules/git/repo_tag.go @@ -52,6 +52,7 @@ func (repo *Repository) getTag(id sha1) (*Tag, error) { if err != nil { return nil, errors.New(stderr) } + tp = strings.TrimSpace(tp) // Tag is a commit. if ObjectType(tp) == COMMIT { @@ -77,7 +78,6 @@ func (repo *Repository) getTag(id sha1) (*Tag, error) { } tag.Id = id - tag.Object = id tag.repo = repo repo.tagCache[id] = tag diff --git a/modules/git/tree.go b/modules/git/tree.go index a3012443d7..be77bfce02 100644 --- a/modules/git/tree.go +++ b/modules/git/tree.go @@ -109,9 +109,12 @@ func (t *Tree) ListEntries(relpath string) (Entries, error) { } t.entriesParsed = true - stdout, _, err := com.ExecCmdDirBytes(t.repo.Path, + stdout, stderr, err := com.ExecCmdDirBytes(t.repo.Path, "git", "ls-tree", t.Id.String()) if err != nil { + if strings.Contains(err.Error(), "exit status 128") { + return nil, errors.New(strings.TrimSpace(string(stderr))) + } return nil, err } t.entries, err = parseTreeData(t, stdout) diff --git a/modules/middleware/repo.go b/modules/middleware/repo.go index c0290b2e8f..c6250f6d59 100644 --- a/modules/middleware/repo.go +++ b/modules/middleware/repo.go @@ -208,10 +208,9 @@ func RepoAssignment(redirect bool, args ...bool) macaron.Handler { } else if gitRepo.IsTagExist(refName) { ctx.Repo.IsTag = true ctx.Repo.BranchName = refName - - ctx.Repo.Commit, err = gitRepo.GetCommitOfTag(refName) + ctx.Repo.Commit, err = ctx.Repo.GitRepo.GetCommitOfTag(refName) if err != nil { - ctx.Handle(500, "RepoAssignment invalid tag", err) + ctx.Handle(500, "Fail to get tag commit", err) return } ctx.Repo.CommitId = ctx.Repo.Commit.Id.String() diff --git a/public/ng/css/gogs.css b/public/ng/css/gogs.css index 6d38ac9b27..feb21c97c2 100644 --- a/public/ng/css/gogs.css +++ b/public/ng/css/gogs.css @@ -833,7 +833,6 @@ ol.linenums { } #dashboard-my-repo .repo-count { margin-left: 4px; - font-size: .8em; } #dashboard-my-org, #dashboard-my-mirror { diff --git a/public/ng/less/gogs/dashboard.less b/public/ng/less/gogs/dashboard.less index e7a1e90c6b..a40debe51a 100644 --- a/public/ng/less/gogs/dashboard.less +++ b/public/ng/less/gogs/dashboard.less @@ -139,7 +139,6 @@ } .repo-count { margin-left: 4px; - font-size: .8em; } } #dashboard-my-org, diff --git a/routers/repo/view.go b/routers/repo/view.go index 82f3460029..ba76a6adae 100644 --- a/routers/repo/view.go +++ b/routers/repo/view.go @@ -118,6 +118,7 @@ func Home(ctx *middleware.Context) { ctx.Handle(404, "SubTree", err) return } + entries, err := tree.ListEntries(treename) if err != nil { ctx.Handle(500, "ListEntries", err) diff --git a/templates/.VERSION b/templates/.VERSION index 2d0d24c2ed..c734a8f05b 100644 --- a/templates/.VERSION +++ b/templates/.VERSION @@ -1 +1 @@ -0.5.4.0929 Beta
\ No newline at end of file +0.5.4.0930 Beta
\ No newline at end of file |