Diff
Not logged in

Differences From:

File src/checkin.c part of check-in [3f706b92a5] - Change the "omitsign" setting into "clearsign" and invert its sense. by drh on 2008-06-06 20:11:16. [view]

To:

File src/checkin.c part of check-in [e976aa6fcb] - Use cr/nl instead of just nl at the end of every line on the check-in comment template for windows. Strip out the cr characters before completing the commit. by drh on 2008-06-08 19:31:28. [view]

@@ -246,8 +246,11 @@
     zEditor = "ed";
   }
   zFile = db_text(0, "SELECT '%qci-comment-' || hex(randomblob(6)) || '.txt'",
                    g.zLocalRoot);
+#ifdef __MINGW32__
+  blob_add_cr(&text);
+#endif
   blob_write_to_file(&text, zFile);
   zCmd = mprintf("%s \"%s\"", zEditor, zFile);
   printf("%s\n", zCmd);
   if( system(zCmd) ){
@@ -254,8 +257,9 @@
     fossil_panic("editor aborted");
   }
   blob_reset(&text);
   blob_read_from_file(&text, zFile);
+  blob_remove_cr(&text);
   unlink(zFile);
   free(zFile);
   blob_zero(pComment);
   while( blob_line(&text, &line) ){