sitting here

1 files changed, 7 insertions, 1 deletions

diff --git a/fi-prune-empty2/stream.go b/fi-prune-empty2/stream.go
index 9d891b1..8c3c25b 100644
--- a/fi-prune-empty2/stream.go
+++ b/fi-prune-empty2/stream.go
@@ -224,9 +224,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 {
-			h.commitMeta.Merge[i] = h.driver.FixCommitIsh(h.commitMeta.Merge[i])
+			fixed := h.driver.FixCommitIsh(h.commitMeta.Merge[i])
+			if fixed != "" {
+				merge = append(merge, fixed)
+			}
 		}
+		h.commitMeta.Merge = merge
 	} else {
 		if len(cmtptr.Parents) == 0 {
 			h.commitMeta.From = EmptyHash
@@ -240,6 +245,7 @@ func (h *Handler) CmdCommitEnd(cmd libfastimport.CmdCommitEnd) error {
 	}
 
 	// emit the commit
+	h.commitMeta.Msg = strings.TrimPrefix(h.commitMeta.Msg, "(from AES) ")
 	if err := h.backend.Do(h.commitMeta); err != nil {
 		return errors.Wrapf(err, "processing commit :%d", h.commitMeta.Mark)
 	}