aboutsummaryrefslogtreecommitdiffstats
path: root/identity
diff options
context:
space:
mode:
authorMichael Muré <batolettre@gmail.com>2021-02-14 12:24:40 +0100
committerMichael Muré <batolettre@gmail.com>2021-02-14 12:24:40 +0100
commit1ced77af1a4bdbaa212a74bf0c56b2b81cdc5bd2 (patch)
treee19a0b4ce8c322f2378b251e38ef6c3ffa2a7646 /identity
parentd0d7be8db010e2c68c98d0a34387e4fac0c4d6ee (diff)
downloadgit-bug-1ced77af1a4bdbaa212a74bf0c56b2b81cdc5bd2.tar.gz
fix merge
Diffstat (limited to 'identity')
-rw-r--r--identity/version.go7
1 files changed, 2 insertions, 5 deletions
diff --git a/identity/version.go b/identity/version.go
index ce5cc7d6..cbd56a98 100644
--- a/identity/version.go
+++ b/identity/version.go
@@ -159,11 +159,8 @@ func (v *version) UnmarshalJSON(data []byte) error {
return err
}
- if aux.FormatVersion < formatVersion {
- return entity.NewErrOldFormatVersion(aux.FormatVersion)
- }
- if aux.FormatVersion > formatVersion {
- return entity.NewErrNewFormatVersion(aux.FormatVersion)
+ if aux.FormatVersion != formatVersion {
+ return entity.NewErrInvalidFormat(aux.FormatVersion, formatVersion)
}
v.id = entity.DeriveId(data)