hgext/rebase.py
changeset 45087 83f75f1efdcc
parent 45085 a0192a03216d
child 45090 0ecb3b11fcad
--- a/hgext/rebase.py	Fri Jul 10 01:36:19 2020 +0200
+++ b/hgext/rebase.py	Sat Jul 11 00:53:34 2020 +0200
@@ -1427,8 +1427,10 @@
 def commitmemorynode(repo, wctx, editor, extra, user, date, commitmsg):
     '''Commit the memory changes with parents p1 and p2.
     Return node of committed revision.'''
-    # Replicates the empty check in ``repo.commit``.
-    if wctx.isempty() and not repo.ui.configbool(b'ui', b'allowemptycommit'):
+    # FIXME: make empty commit check consistent with ``repo.commit``
+    if wctx.nofilechanges() and not repo.ui.configbool(
+        b'ui', b'allowemptycommit'
+    ):
         return None
 
     # By convention, ``extra['branch']`` (set by extrafn) clobbers