diff options
author | Michael Muré <batolettre@gmail.com> | 2019-11-19 18:54:22 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-11-19 18:54:22 +0100 |
commit | abae3c245e1f844ebadb79eb5d7b19412f67f886 (patch) | |
tree | 9c5e06aa4e1ef9b41ceb21408de493d2e91b3d00 /repository/git.go | |
parent | fdbff4dba7d6e56edfed1030e6fede2a7a35b507 (diff) | |
parent | ed2ac793e9f353720db2615b06569d05c253b977 (diff) | |
download | git-bug-abae3c245e1f844ebadb79eb5d7b19412f67f886.tar.gz |
Merge pull request #257 from MichaelMure/core-fixes
Core fixes
Diffstat (limited to 'repository/git.go')
-rw-r--r-- | repository/git.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/repository/git.go b/repository/git.go index 2c72fccd..d4560805 100644 --- a/repository/git.go +++ b/repository/git.go @@ -461,14 +461,14 @@ func (repo *GitRepo) EditTimeIncrement() (lamport.Time, error) { return repo.editClock.Increment() } -// CreateWitness witness another create time and increment the corresponding clock +// WitnessCreate witness another create time and increment the corresponding clock // if needed. -func (repo *GitRepo) CreateWitness(time lamport.Time) error { +func (repo *GitRepo) WitnessCreate(time lamport.Time) error { return repo.createClock.Witness(time) } -// EditWitness witness another edition time and increment the corresponding clock +// WitnessEdit witness another edition time and increment the corresponding clock // if needed. -func (repo *GitRepo) EditWitness(time lamport.Time) error { +func (repo *GitRepo) WitnessEdit(time lamport.Time) error { return repo.editClock.Witness(time) } |