diff options
| author | Máximo Cuadros <mcuadros@gmail.com> | 2019-02-14 12:35:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-14 12:35:30 +0100 |
| commit | db6c41c156481962abf9a55a324858674c25ab08 (patch) | |
| tree | 6f1b155a059fd9f623473d61305a81ab5efa596b /utils/merkletrie/noder/path.go | |
| parent | 4d8bd13a73d6efd41b6be0b2eba5130c498fae0d (diff) | |
| parent | c40fcefddec1d07fb5a06c2173b409f37f7409d1 (diff) | |
| download | go-git-db6c41c156481962abf9a55a324858674c25ab08.tar.gz | |
Merge pull request #1065 from vmarkovtsev/fix-unicodev4.10.0
Remove Unicode normalization in difftree
Diffstat (limited to 'utils/merkletrie/noder/path.go')
| -rw-r--r-- | utils/merkletrie/noder/path.go | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/utils/merkletrie/noder/path.go b/utils/merkletrie/noder/path.go index e9c905c..1c7ef54 100644 --- a/utils/merkletrie/noder/path.go +++ b/utils/merkletrie/noder/path.go @@ -3,8 +3,6 @@ package noder import ( "bytes" "strings" - - "golang.org/x/text/unicode/norm" ) // Path values represent a noder and its ancestors. The root goes first @@ -80,11 +78,9 @@ func (p Path) Compare(other Path) int { case i == len(p): return -1 default: - form := norm.Form(norm.NFC) - this := form.String(p[i].Name()) - that := form.String(other[i].Name()) - - cmp := strings.Compare(this, that) + // We do *not* normalize Unicode here. CGit doesn't. + // https://github.com/src-d/go-git/issues/1057 + cmp := strings.Compare(p[i].Name(), other[i].Name()) if cmp != 0 { return cmp } |