--- a/hgext/rebase.py	Fri Jan 06 22:50:04 2017 +0900
+++ b/hgext/rebase.py	Sun Jan 01 13:16:29 2017 +0100
@@ -1316,6 +1316,10 @@
                 ui.debug('--update and --rebase are not compatible, ignoring '
                          'the update flag\n')
 
+            ui.debug('before rebase: ensure working dir is clean\n')
+            cmdutil.checkunfinished(repo)
+            cmdutil.bailifchanged(repo)
+
             revsprepull = len(repo)
             origpostincoming = commands.postincoming
             def _dummy(*args, **kwargs):