--- a/tests/test-amend-patch.t	Mon Jul 09 01:18:40 2018 +0200
+++ b/tests/test-amend-patch.t	Sun Jul 08 22:50:16 2018 +0530
@@ -1156,3 +1156,35 @@
 
 Nothing happens in that case we dont care about the node ID. Look the above 3-4
 tests to realize I was testing that too.
+
+Aborting by passing an empty patch file (issue5925)
+---------------------------------------------------
+
+  $ cat > editor.sh <<EOF
+  > #!/bin/sh
+  > cat > \$1 <<ENDOF
+  > ENDOF
+  > EOF
+
+  $ HGEDITOR="sh ./editor.sh" hg amend --patch
+
+  $ hg exp
+  # HG changeset patch
+  # User RandomUser
+  # Date 123456 1200
+  #      Fri Jan 02 09:57:36 1970 -0020
+  # Branch stable
+  # Node ID 958c723d2247bedf32c155b7976e79b82332c02e
+  # Parent  0000000000000000000000000000000000000000
+  
+  
+
+  $ hg parents
+  changeset:   19:958c723d2247
+  branch:      stable
+  bookmark:    foo
+  tag:         tip
+  parent:      -1:000000000000
+  user:        RandomUser
+  date:        Fri Jan 02 09:57:36 1970 -0020
+