vitalif
/
gogs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

repo/commit: improve error detection 

Response 404 not 500 for raw diff if object does not exist.
master
Unknwon 2017-04-04 02:01:29 -04:00
parent 55afc1ad21
commit 41c8e87be8
No known key found for this signature in database
GPG Key ID: 25B575AE3213B2B3
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
routers/repo/commit.go
View File

@ -179,14 +179,14 @@ func Diff(ctx *context.Context) {
ctx.HTML(200, DIFF)
}
func RawDiff(ctx *context.Context) {
func RawDiff(c *context.Context) {
if err := git.GetRawDiff(
models.RepoPath(ctx.Repo.Owner.Name, ctx.Repo.Repository.Name),
ctx.Params(":sha"),
git.RawDiffType(ctx.Params(":ext")),
ctx.Resp,
models.RepoPath(c.Repo.Owner.Name, c.Repo.Repository.Name),
c.Params(":sha"),
git.RawDiffType(c.Params(":ext")),
c.Resp,
); err != nil {
ctx.Handle(500, "GetRawDiff", err)
c.NotFoundOrServerError("GetRawDiff", git.IsErrNotExist, err)
return
}
}

5
vendor/github.com/gogits/git-module/repo_commit.go generated vendored
View File

@ -106,7 +106,7 @@ func (repo *Repository) getCommit(id sha1) (*Commit, error) {
data, err := NewCommand("cat-file", "-p", id.String()).RunInDirBytes(repo.Path)
if err != nil {
if strings.Contains(err.Error(), "fatal: Not a valid object name") {
if strings.Contains(err.Error(), "exit status 128") {
return nil, ErrNotExist{id.String(), ""}
}
return nil, err
@ -129,6 +129,9 @@ func (repo *Repository) GetCommit(commitID string) (*Commit, error) {
var err error
commitID, err = NewCommand("rev-parse", commitID).RunInDir(repo.Path)
if err != nil {
if strings.Contains(err.Error(), "exit status 128") {
return nil, ErrNotExist{commitID, ""}
}
return nil, err
}
}

6
vendor/vendor.json vendored
View File

@ -159,10 +159,10 @@
"revisionTime": "2016-08-10T03:50:02Z"
},
{
"checksumSHA1": "iZ3qMzzA24U3eqGifUZa6kFuCqk=",
"checksumSHA1": "XT0fyELKMKgb4XeMAtIrmi4SetM=",
"path": "github.com/gogits/git-module",
"revision": "5dba4f883034198eabac620b73aabf5488fcd821",
"revisionTime": "2017-04-04T05:34:13Z"
"revision": "2a496cad1f36aed60b14844b33b68eb3edfc2718",
"revisionTime": "2017-04-04T05:59:12Z"
},
{
"checksumSHA1": "D2kVXl0QpIw6t3891Sl7IM9wL+w=",