entity: more progress on merging and signing

1 files changed, 4 insertions, 10 deletions

diff --git a/entity/dag/entity.go b/entity/dag/entity.go
index 78347fa0..63d7fc3b 100644
--- a/entity/dag/entity.go
+++ b/entity/dag/entity.go
@@ -318,7 +318,6 @@ func (e *Entity) CommitAdNeeded(repo repository.ClockedRepo) error {
 }
 
 // Commit write the appended operations in the repository
-// TODO: support commit signature
 func (e *Entity) Commit(repo repository.ClockedRepo) error {
 	if !e.NeedCommit() {
 		return fmt.Errorf("can't commit an entity with no pending operation")
@@ -361,18 +360,13 @@ func (e *Entity) Commit(repo repository.ClockedRepo) error {
 		// PackTime:   packTime,
 	}
 
-	treeHash, err := opp.Write(e.Definition, repo)
-	if err != nil {
-		return err
-	}
-
-	// Write a Git commit referencing the tree, with the previous commit as parent
 	var commitHash repository.Hash
-	if e.lastCommit != "" {
-		commitHash, err = repo.StoreCommit(treeHash, e.lastCommit)
+	if e.lastCommit == "" {
+		commitHash, err = opp.Write(e.Definition, repo)
 	} else {
-		commitHash, err = repo.StoreCommit(treeHash)
+		commitHash, err = opp.Write(e.Definition, repo, e.lastCommit)
 	}
+
 	if err != nil {
 		return err
 	}