Diff
Not logged in

Differences From:

File src/checkin.c part of check-in [e146d800ac] - Add the "mv" and "rename" commands (aliases for the same thing). by drh on 2008-11-09 19:22:06. [view]

To:

File src/checkin.c part of check-in [6f0a9f730b] - Mention that check-in comments follow wiki formatting rules. If the check-in comment is blank, prompt the user to abort the check-in. by drh on 2008-11-26 03:26:56. [view]

@@ -256,9 +256,11 @@
   Blob text, line;
   char *zComment;
   int i;
   blob_set(&text,
-    "\n# Enter comments on this commit.  Lines beginning with # are ignored\n"
+    "\n"
+    "# Enter comments on this check-in.  Lines beginning with # are ignored.\n"
+    "# The check-in comment follows wiki formatting rules.\n"
     "#\n"
   );
   status_report(&text, "# ");
   zEditor = db_get("editor", 0);
@@ -451,8 +453,17 @@
     blob_zero(&comment);
     blob_append(&comment, zComment, -1);
   }else{
     prepare_commit_comment(&comment);
+    if( blob_size(&comment)==0 ){
+      Blob ans;
+      blob_zero(&ans);
+      prompt_user("empty check-in comment.  continue [y/N]? ", &ans);
+      if( blob_str(&ans)[0]!='y' ){
+        db_end_transaction(1);
+        exit(1);
+      }
+    }
   }
 
   /* Step 1: Insert records for all modified files into the blob
   ** table. If there were arguments passed to this command, only