Fix #515

diff --git a/gogs.go b/gogs.go
index e7615c9b2ba331a722ecc269b4dff2ab51185d3a..0ea64d26f4eb7105c192bf64ad7978ef06e14df7 100644 (file)
--- a/gogs.go
+++ b/gogs.go
@@ -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 cd0181c481b98128090401c6dac5d3d5f1999bf3..7c47b53dc4badfcea141f0a99741095aa15af531 100644 (file)
--- 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 dd31e4414fcdc19c611253f48f1459759d2fc688..77ae3db0075ed94f86f93378dd43030b2bd941a7 100644 (file)
--- 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 a3012443d73eb6843d57d753a86c2ce42bfc27ce..be77bfce022ecf950b9da69f8d70aa984d715b9f 100644 (file)
--- 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 c0290b2e8f0f3b4ab9ad9ccd4b94a6267b1c5349..c6250f6d59036ace4dccf66a377816e2942ada85 100644 (file)
--- 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 6d38ac9b2706f849b002014d51f92d252df25a53..feb21c97c272b56027abc050895b13b67023da48 100644 (file)
--- 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 e7a1e90c6be313b67ebc97b78054b1fb672b511f..a40debe51a28aca6d312313759b6ee9775dc94f7 100644 (file)
--- 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 82f34600298388e1328602592836836bc420ad28..ba76a6adaeafbcdd5abe8fbc292225b6f35b6175 100644 (file)
--- 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 2d0d24c2ed88fac15e90a9f2b6cbe6218d6bc37f..c734a8f05bbbe0ad7741d00fac6ddcfd100dd0dc 100644 (file)
--- 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