Differences From:

File src/checkin.c part of check-in [18a66ab32b] - accommodated brackets/parens conventions change introduced in #6ae51190cc by stephan on 2009-12-11 16:27:22. [view]

To:

File src/checkin.c part of check-in [70656d00f6] - Minor clean up to the "ci" command. by drh on 2009-12-11 16:29:00. Also file src/checkin.c part of check-in [1c2d878d12] - Merge with trunk by btheado on 2009-12-13 01:16:13. [view]

@@ -550,10 +550,10 @@
   if( zComment ){
     blob_zero(&comment);
     blob_append(&comment, zComment, -1);
   }else if( zCommentFile ){
-      blob_zero(&comment);
-      blob_read_from_file(&comment, zCommentFile);
+    blob_zero(&comment);
+    blob_read_from_file(&comment, zCommentFile);
   }else{
     char *zInit = db_text(0, "SELECT value FROM vvar WHERE name='ci-comment'");
     prepare_commit_comment(&comment, zInit);
     free(zInit);
@@ -565,12 +565,14 @@
     if( blob_str(&ans)[0]!='y' ){
       db_end_transaction(1);
       exit(1);
     }
-  }
-  db_multi_exec("REPLACE INTO vvar VALUES('ci-comment',%B)", &comment);
-  db_end_transaction(0);
-  db_begin_transaction();
+  }else{
+    db_multi_exec("REPLACE INTO vvar VALUES('ci-comment',%B)", &comment);
+    db_end_transaction(0);
+    db_begin_transaction();
+  }
+
   /* Step 1: Insert records for all modified files into the blob
   ** table. If there were arguments passed to this command, only
   ** the identified fils are inserted (if they have been modified).
   */