aboutsummaryrefslogtreecommitdiffstats
path: root/utils/merkletrie/noder/path.go
diff options
context:
space:
mode:
authorVadim Markovtsev <vadim@sourced.tech>2019-02-11 21:13:44 +0100
committerVadim Markovtsev <vadim@sourced.tech>2019-02-11 22:57:16 +0100
commitc40fcefddec1d07fb5a06c2173b409f37f7409d1 (patch)
tree18a8e6da1502054fe49509f4e342398c06f82a95 /utils/merkletrie/noder/path.go
parentcd64b4d630b6c2d2b3d72e9615e14f9d58bb5787 (diff)
downloadgo-git-c40fcefddec1d07fb5a06c2173b409f37f7409d1.tar.gz
Remove Unicode normalization in difftree
Fixes #1057 Signed-off-by: Vadim Markovtsev <vadim@sourced.tech>
Diffstat (limited to 'utils/merkletrie/noder/path.go')
-rw-r--r--utils/merkletrie/noder/path.go10
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
}