markdown: fix treating pure number as SHA1

- Detect non-exist commit and return 404 not 500

Author: unknwon

.gopmfile

@@ -18,7 +18,7 @@ github.com/go-xorm/core = commit:5bf745d
 github.com/go-xorm/xorm = commit:c6c7056
 github.com/gogits/chardet = commit:2404f77
 github.com/gogits/cron = commit:7f3990a
-github.com/gogits/git-module = commit:31d8d73
+github.com/gogits/git-module = commit:2a820b5
 github.com/gogits/go-gogs-client = commit:e363d3f
 github.com/issue9/identicon = commit:d36b545
 github.com/jaytaylor/html2text = commit:52d9b78

cmd/web.go

@@ -88,7 +88,7 @@ func checkVersion() {
 		{"github.com/go-macaron/toolbox", toolbox.Version, "0.1.0"},
 		{"gopkg.in/ini.v1", ini.Version, "1.8.4"},
 		{"gopkg.in/macaron.v1", macaron.Version, "1.1.7"},
-		{"github.com/gogits/git-module", git.Version, "0.3.5"},
+		{"github.com/gogits/git-module", git.Version, "0.3.6"},
 		{"github.com/gogits/go-gogs-client", gogs.Version, "0.12.0"},
 	}
 	for _, c := range checkers {

glide.lock

@@ -91,6 +91,8 @@ var (
 	IssueAlphanumericPattern = regexp.MustCompile(`( |^|\()[A-Z]{1,10}-[1-9][0-9]*\b`)
 
 	// Sha1CurrentPattern matches string that represents a commit SHA, e.g. d8a994ef243349f321568f9e36d5c3f444b99cae
+	// FIXME: this pattern matches pure numbers as well, right now we do a hack to check in RenderSha1CurrentPattern
+	// by converting string to a number.
 	Sha1CurrentPattern = regexp.MustCompile(`\b[0-9a-f]{7,40}\b`)
 )
 
@@ -262,6 +264,9 @@ func RenderIssueIndexPattern(rawBytes []byte, urlPrefix string, metas map[string
 // RenderSha1CurrentPattern renders SHA1 strings to corresponding links that assumes in the same repository.
 func RenderSha1CurrentPattern(rawBytes []byte, urlPrefix string) []byte {
 	return []byte(Sha1CurrentPattern.ReplaceAllStringFunc(string(rawBytes[:]), func(m string) string {
+		if com.StrTo(m).MustInt() > 0 {
+			return m
+		}
 		return fmt.Sprintf(`<a href="%s/commit/%s"><code>%s</code></a>`, urlPrefix, m, base.ShortSha(string(m)))
 	}))
 }

modules/markdown/markdown.go

@@ -152,7 +152,11 @@ func Diff(ctx *context.Context) {
 
 	commit, err := ctx.Repo.GitRepo.GetCommit(commitID)
 	if err != nil {
-		ctx.Handle(500, "Repo.GitRepo.GetCommit", err)
+		if git.IsErrNotExist(err) {
+			ctx.Handle(404, "Repo.GitRepo.GetCommit", err)
+		} else {
+			ctx.Handle(500, "Repo.GitRepo.GetCommit", err)
+		}
 		return
 	}