From 7209917fd7f8da423b1d779c744b48431c7aaae8 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Mon, 9 Jan 2017 23:51:21 +0800 Subject: [PATCH] bug fix release --- routers/repo/release.go | 5 +++++ vendor/code.gitea.io/git/Makefile | 2 +- vendor/code.gitea.io/git/repo_tag.go | 8 ++++---- vendor/code.gitea.io/git/tree_entry.go | 2 +- vendor/vendor.json | 6 +++--- 5 files changed, 14 insertions(+), 9 deletions(-) diff --git a/routers/repo/release.go b/routers/repo/release.go index c2e5aabf8..01ed3c37a 100644 --- a/routers/repo/release.go +++ b/routers/repo/release.go @@ -71,6 +71,11 @@ func Releases(ctx *context.Context) { return } + if len(rawTags) == 0 { + ctx.HTML(200, tplReleases) + return + } + if len(rawTags) <= (page-1)*limit { ctx.Handle(500, "Releases", errors.New("no more pages")) return diff --git a/vendor/code.gitea.io/git/Makefile b/vendor/code.gitea.io/git/Makefile index 04fb8f587..683b8e522 100644 --- a/vendor/code.gitea.io/git/Makefile +++ b/vendor/code.gitea.io/git/Makefile @@ -18,7 +18,7 @@ generate: .PHONY: fmt fmt: - go fmt $(PACKAGES) + find . -name "*.go" -type f -not -path "./vendor/*" | xargs gofmt -s -w .PHONY: vet vet: diff --git a/vendor/code.gitea.io/git/repo_tag.go b/vendor/code.gitea.io/git/repo_tag.go index 33a833d3a..6503c8ada 100644 --- a/vendor/code.gitea.io/git/repo_tag.go +++ b/vendor/code.gitea.io/git/repo_tag.go @@ -118,7 +118,7 @@ func parseTag(line string, opt TagOption) (*Tag, error) { } left := strings.TrimSpace(line[25:]) - start := strings.Index(left, "(tag: ") + start := strings.Index(left, "tag: ") if start < 0 { return nil, nil } @@ -127,11 +127,11 @@ func parseTag(line string, opt TagOption) (*Tag, error) { return nil, nil } end = end + start + 1 - part := strings.IndexByte(left[start+6:end], ',') + part := strings.IndexByte(left[start+5:end], ',') if part > 0 { - tag.Name = strings.TrimSpace(left[start+6 : start+6+part]) + tag.Name = strings.TrimSpace(left[start+5 : start+5+part]) } else { - tag.Name = strings.TrimSpace(left[start+6 : end]) + tag.Name = strings.TrimSpace(left[start+5 : end]) } next := strings.IndexByte(left[end+2:], ' ') if next < 0 { diff --git a/vendor/code.gitea.io/git/tree_entry.go b/vendor/code.gitea.io/git/tree_entry.go index 3f68d9868..1e4934e81 100644 --- a/vendor/code.gitea.io/git/tree_entry.go +++ b/vendor/code.gitea.io/git/tree_entry.go @@ -162,7 +162,7 @@ func (tes Entries) GetCommitsInfo(commit *Commit, treePath string) ([][]interfac // GetCommitsInfoWithCustomConcurrency takes advantages of concurrency to speed up getting information // of all commits that are corresponding to these entries. If the given maxConcurrency is negative or -// equal to zero: the right number of goroutine (concurrency) to use will be choosen related of the +// equal to zero: the right number of goroutine (concurrency) to use will be chosen related of the // host CPU. func (tes Entries) GetCommitsInfoWithCustomConcurrency(commit *Commit, treePath string, maxConcurrency int) ([][]interface{}, error) { if len(tes) == 0 { diff --git a/vendor/vendor.json b/vendor/vendor.json index d34874edd..f5b4228bc 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -3,10 +3,10 @@ "ignore": "test", "package": [ { - "checksumSHA1": "zK/6EifSPy/O5Vbx7CMWfnLHExI=", + "checksumSHA1": "P2wIRW07gnEgqLZAcg7bz+Jw9Oc=", "path": "code.gitea.io/git", - "revision": "a3ee12b97af51eec1b7aa0525f6a39c97520817d", - "revisionTime": "2017-01-05T02:48:44Z" + "revision": "7477742b3c79d36d099baaf614864b6bbdfdecca", + "revisionTime": "2017-01-09T15:46:57Z" }, { "checksumSHA1": "BKj0haFTDebzdC2nACpoGzp3s8A=",