branch: elpa/magit
commit 621e69eb9bc3379511d5e6b8bb82094ef8e71cfa
Author: Jonas Bernoulli <jo...@bernoul.li>
Commit: Jonas Bernoulli <jo...@bernoul.li>

    magit-rebase-insert-merge-sequence: Skip over empty lines
---
 lisp/magit-sequence.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/magit-sequence.el b/lisp/magit-sequence.el
index 0c8fecbbd0..1b3d08ecf9 100644
--- a/lisp/magit-sequence.el
+++ b/lisp/magit-sequence.el
@@ -1024,7 +1024,7 @@ status buffer (i.e., the reverse of how they will be 
applied)."
         ((or 'commit (and 'merge (guard abbrev)))
          (magit-sequence-insert-commit action target 'magit-sequence-pick
                                        abbrev trailer))
-        (_ (magit-sequence-insert-step action target)))))
+        ((guard action) (magit-sequence-insert-step action target)))))
   (let ((dir (magit-gitdir)))
     (magit-sequence-insert-sequence
      (magit-file-line (expand-file-name "rebase-merge/stopped-sha" dir))

Reply via email to