diff options
| author | Michael Muré <batolettre@gmail.com> | 2023-01-11 13:36:10 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-11 13:36:10 +0100 |
| commit | 76100380978418dbfa6fa880f05d335c9a4aafcd (patch) | |
| tree | c843bf0f26bc9b3d8483895ee0d6d0fc7f568470 /entities/identity | |
| parent | 5d7a10fbb246d2bbcefe0eabc4403afe22e26124 (diff) | |
| parent | 637071a84b6dd25df42b8fa79f31bc73d338c55a (diff) | |
| download | git-bug-76100380978418dbfa6fa880f05d335c9a4aafcd.tar.gz | |
Merge pull request #988 from MichaelMure/fix-cache-test
cache: fix tests?
Diffstat (limited to 'entities/identity')
| -rw-r--r-- | entities/identity/identity.go | 6 | ||||
| -rw-r--r-- | entities/identity/version.go | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/entities/identity/identity.go b/entities/identity/identity.go index b0cee43b..22ce652c 100644 --- a/entities/identity/identity.go +++ b/entities/identity/identity.go @@ -383,9 +383,9 @@ func (i *Identity) NeedCommit() bool { // cleaning would be required. // // An alternative approach would be to have a determinist rebase: -// - any commits present in both local and remote version would be kept, never changed. -// - newer commits would be merged in a linear chain of commits, ordered based on the -// Lamport time +// - any commits present in both local and remote version would be kept, never changed. +// - newer commits would be merged in a linear chain of commits, ordered based on the +// Lamport time // // However, this approach leave the possibility, in the case of a compromised crypto keys, // of forging a new version with a bogus Lamport time to be inserted before a legit version, diff --git a/entities/identity/version.go b/entities/identity/version.go index 9a52d089..fe1565cf 100644 --- a/entities/identity/version.go +++ b/entities/identity/version.go @@ -15,8 +15,8 @@ import ( ) // 1: original format -// 2: Identity Ids are generated from the first version serialized data instead of from the first git commit -// + Identity hold multiple lamport clocks from other entities, instead of just bug edit +// 2: Identity Ids are generated from the first version serialized data instead of from the first git +// commit + Identity hold multiple lamport clocks from other entities, instead of just bug edit const formatVersion = 2 // version is a complete set of information about an Identity at a point in time. @@ -31,7 +31,7 @@ type version struct { unixTime int64 // The set of keys valid at that time, from this version onward, until they get removed - // in a new version. This allow to have multiple key for the same identity (e.g. one per + // in a new version. This allows to have multiple key for the same identity (e.g. one per // device) as well as revoke key. keys []*Key |