no force?

2 files changed, 8 insertions, 28 deletions

diff --git a/fi-prune-empty2/prune.go b/fi-prune-empty2/prune.go
index 20fae17..8933872 100644
--- a/fi-prune-empty2/prune.go
+++ b/fi-prune-empty2/prune.go
@@ -256,9 +256,6 @@ func (p *Pruner) isFastForward(commit Commit) (bool, error) {
 }
 
 func (p *Pruner) shouldPrune(commit Commit) (bool, error) {
-	if commit.Force {
-		return false, nil
-	}
 	switch p.pruneEmpty {
 	case PruneAlways:
 		isEmpty, err := p.isEmpty(commit)
diff --git a/fi-prune-empty2/stream.go b/fi-prune-empty2/stream.go
index 03253b7..a785faa 100644
--- a/fi-prune-empty2/stream.go
+++ b/fi-prune-empty2/stream.go
@@ -75,8 +75,6 @@ type Commit struct {
 	OriginalOID Hash
 	Parents     []Mark
 	Tree        Tree
-
-	Force bool
 }
 
 type Driver interface {
@@ -182,11 +180,7 @@ func (h *Handler) CmdCommitEnd(cmd libfastimport.CmdCommitEnd) error {
 		return parents, nil
 	}()
 	if err != nil {
-		if true /* partial */ {
-			cmt.Force = true
-		} else {
-			return err
-		}
+		return err
 	}
 
 	sort.Stable(h.commitFile)
@@ -222,25 +216,14 @@ func (h *Handler) CmdCommitEnd(cmd libfastimport.CmdCommitEnd) error {
 	}
 
 	// apply the result of ProcessCommit to h.commitMeta
-	if cmt.Force {
-		h.commitMeta.From = h.driver.FixCommitIsh(h.commitMeta.From)
-		merge := make([]string, 0, len(h.commitMeta.Merge))
-		for i := range h.commitMeta.Merge {
-			fixed := h.driver.FixCommitIsh(h.commitMeta.Merge[i])
-			if fixed != "" {
-				merge = append(merge, fixed)
-			}
-		}
-		h.commitMeta.Merge = merge
+	if len(cmtptr.Parents) == 0 {
+		h.commitMeta.From = EmptyHash
+		h.commitMeta.Merge = nil
 	} else {
-		if len(cmtptr.Parents) == 0 {
-			h.commitMeta.From = EmptyHash
-		} else {
-			h.commitMeta.From = fmt.Sprintf(":%d", cmtptr.Parents[0])
-			h.commitMeta.Merge = nil
-			for _, merge := range cmtptr.Parents[1:] {
-				h.commitMeta.Merge = append(h.commitMeta.Merge, fmt.Sprintf(":%d", merge))
-			}
+		h.commitMeta.From = fmt.Sprintf(":%d", cmtptr.Parents[0])
+		h.commitMeta.Merge = nil
+		for _, merge := range cmtptr.Parents[1:] {
+			h.commitMeta.Merge = append(h.commitMeta.Merge, fmt.Sprintf(":%d", merge))
 		}
 	}