Skip to content

Commit 1b10bc0

Browse files
daviianlafriks
authored andcommitted
update git vendor (#4059) (#4075)
* update git vendor (#4059) * fix errors resulting from git vendor update * fmt
1 parent 561f459 commit 1b10bc0

File tree

12 files changed

+265
-117
lines changed

12 files changed

+265
-117
lines changed

models/git_diff.go

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import (
1414
"io/ioutil"
1515
"os"
1616
"os/exec"
17+
"strconv"
1718
"strings"
1819

1920
"code.gitea.io/git"
@@ -368,8 +369,15 @@ func ParsePatch(maxLines, maxLineCharacters, maxFiles int, reader io.Reader) (*D
368369
a := line[beg+2 : middle]
369370
b := line[middle+3:]
370371
if hasQuote {
371-
a = string(git.UnescapeChars([]byte(a[1 : len(a)-1])))
372-
b = string(git.UnescapeChars([]byte(b[1 : len(b)-1])))
372+
var err error
373+
a, err = strconv.Unquote(a)
374+
if err != nil {
375+
return nil, fmt.Errorf("Unquote: %v", err)
376+
}
377+
b, err = strconv.Unquote(b)
378+
if err != nil {
379+
return nil, fmt.Errorf("Unquote: %v", err)
380+
}
373381
}
374382

375383
curFile = &DiffFile{

vendor/code.gitea.io/git/Gopkg.lock

Lines changed: 38 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/code.gitea.io/git/Gopkg.toml

Lines changed: 34 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/code.gitea.io/git/MAINTAINERS

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/code.gitea.io/git/error.go

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/code.gitea.io/git/parse.go

Lines changed: 81 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/code.gitea.io/git/repo_blame.go

Lines changed: 15 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/code.gitea.io/git/repo_commit.go

Lines changed: 27 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/code.gitea.io/git/sha1.go

Lines changed: 5 additions & 24 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)