From 007fb00c0ec613b89e2a272f224b60c174fc78bd Mon Sep 17 00:00:00 2001
From: a1012112796 <1012112796@qq.com>
Date: Thu, 1 Apr 2021 13:17:14 +0800
Subject: [PATCH] response 404 for diff/patch of a commit that not exist
(#15221)
* response 404 for diff/patch of a commit that not exist
fix #15217
Signed-off-by: a1012112796 <1012112796@qq.com>
* Update routers/repo/commit.go
Co-authored-by: silverwind <me@silverwind.io>
* use ctx.NotFound()
Co-authored-by: zeripath <art27@cantab.net>
Co-authored-by: silverwind <me@silverwind.io>
---
modules/git/diff.go | 2 +-
routers/repo/commit.go | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/modules/git/diff.go b/modules/git/diff.go
index 6faad1c3c0..5da53568e5 100644
--- a/modules/git/diff.go
+++ b/modules/git/diff.go
@@ -47,7 +47,7 @@ func GetRawDiffForFile(repoPath, startCommit, endCommit string, diffType RawDiff
func GetRepoRawDiffForFile(repo *Repository, startCommit, endCommit string, diffType RawDiffType, file string, writer io.Writer) error {
commit, err := repo.GetCommit(endCommit)
if err != nil {
- return fmt.Errorf("GetCommit: %v", err)
+ return err
}
fileArgs := make([]string, 0)
if len(file) > 0 {
diff --git a/routers/repo/commit.go b/routers/repo/commit.go
index c06d092613..74f1778626 100644
--- a/routers/repo/commit.go
+++ b/routers/repo/commit.go
@@ -6,6 +6,7 @@
package repo
import (
+ "errors"
"path"
"strings"
@@ -388,6 +389,11 @@ func RawDiff(ctx *context.Context) {
git.RawDiffType(ctx.Params(":ext")),
ctx.Resp,
); err != nil {
+ if git.IsErrNotExist(err) {
+ ctx.NotFound("GetRawDiff",
+ errors.New("commit "+ctx.Params(":sha")+" does not exist."))
+ return
+ }
ctx.ServerError("GetRawDiff", err)
return
}