aboutsummaryrefslogtreecommitdiffstats
path: root/bug/operation_pack.go
diff options
context:
space:
mode:
authorMichael Muré <batolettre@gmail.com>2020-07-01 19:39:02 +0200
committerMichael Muré <batolettre@gmail.com>2020-07-01 19:39:02 +0200
commit3cf31fc4049fefc82db0a3d2018b5d98ab77c5d7 (patch)
treec77a29e1f35fefa5040454976c6edcf86e7678bc /bug/operation_pack.go
parent33d510ac3999b3d8fa7a4652dc44a21c713f97de (diff)
downloadgit-bug-3cf31fc4049fefc82db0a3d2018b5d98ab77c5d7.tar.gz
repository: merge git.Hash in for one less /util package
Diffstat (limited to 'bug/operation_pack.go')
-rw-r--r--bug/operation_pack.go8
1 files changed, 4 insertions, 4 deletions
diff --git a/bug/operation_pack.go b/bug/operation_pack.go
index 86e4178e..58c8381c 100644
--- a/bug/operation_pack.go
+++ b/bug/operation_pack.go
@@ -4,9 +4,9 @@ import (
"encoding/json"
"fmt"
- "github.com/MichaelMure/git-bug/repository"
- "github.com/MichaelMure/git-bug/util/git"
"github.com/pkg/errors"
+
+ "github.com/MichaelMure/git-bug/repository"
)
const formatVersion = 1
@@ -21,7 +21,7 @@ type OperationPack struct {
Operations []Operation
// Private field so not serialized
- commitHash git.Hash
+ commitHash repository.Hash
}
func (opp *OperationPack) MarshalJSON() ([]byte, error) {
@@ -135,7 +135,7 @@ func (opp *OperationPack) Validate() error {
// Write will serialize and store the OperationPack as a git blob and return
// its hash
-func (opp *OperationPack) Write(repo repository.ClockedRepo) (git.Hash, error) {
+func (opp *OperationPack) Write(repo repository.ClockedRepo) (repository.Hash, error) {
// make sure we don't write invalid data
err := opp.Validate()
if err != nil {