diff -r 3ee036c6f834 -r fca9c63f160e mercurial/commands.py
--- a/mercurial/commands.py	Thu Jun 10 14:47:14 2021 -0700
+++ b/mercurial/commands.py	Thu Jun 10 14:55:10 2021 -0700
@@ -2135,8 +2135,8 @@
         if not obsolete.isenabled(repo, obsolete.createmarkersopt):
             cmdutil.checkunfinished(repo)
 
+        node = cmdutil.amend(ui, repo, old, extra, pats, opts)
         opts = pycompat.byteskwargs(opts)
-        node = cmdutil.amend(ui, repo, old, extra, pats, opts)
         if node == old.node():
             ui.status(_(b"nothing changed\n"))
             return 1