diff options
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | gogs.go | 2 | ||||
| -rw-r--r-- | models/git_diff.go | 11 | ||||
| -rw-r--r-- | templates/.VERSION | 2 |
4 files changed, 13 insertions, 4 deletions
@@ -3,7 +3,7 @@ Gogs - Go Git Service [ -##### Current tip version: 0.9.80 (see [Releases](https://github.com/gogits/gogs/releases) for binary versions) +##### Current tip version: 0.9.81 (see [Releases](https://github.com/gogits/gogs/releases) for binary versions) | Web | UI | Preview | |:-------------:|:-------:|:-------:| @@ -17,7 +17,7 @@ import ( "github.com/gogits/gogs/modules/setting" ) -const APP_VER = "0.9.80.0815" +const APP_VER = "0.9.81.0816" func init() { runtime.GOMAXPROCS(runtime.NumCPU()) diff --git a/models/git_diff.go b/models/git_diff.go index a63a1bb999..a45c44345b 100644 --- a/models/git_diff.go +++ b/models/git_diff.go @@ -72,6 +72,15 @@ var ( func diffToHTML(diffs []diffmatchpatch.Diff, lineType DiffLineType) template.HTML { buf := bytes.NewBuffer(nil) + + // Reproduce signs which are cutted for inline diff before. + switch lineType { + case DIFF_LINE_ADD: + buf.WriteByte('+') + case DIFF_LINE_DEL: + buf.WriteByte('-') + } + for i := range diffs { switch { case diffs[i].Type == diffmatchpatch.DiffInsert && lineType == DIFF_LINE_ADD: @@ -167,7 +176,7 @@ func (diffSection *DiffSection) GetComputedInlineDiffFor(diffLine *DiffLine) tem diff1 = diffLine.Content diff2 = compareDiffLine.Content default: - return template.HTML(html.EscapeString(diffLine.Content[1:])) + return template.HTML(html.EscapeString(diffLine.Content)) } diffRecord := diffMatchPatch.DiffMain(diff1[1:], diff2[1:], true) diff --git a/templates/.VERSION b/templates/.VERSION index 1bc4bb85d4..d381c8cafc 100644 --- a/templates/.VERSION +++ b/templates/.VERSION @@ -1 +1 @@ -0.9.80.0815
\ No newline at end of file +0.9.81.0816
\ No newline at end of file |