Differences From:

File src/db.c part of check-in [007d1ce44f] - Rename admin_sql_page.c to admin.c. Refactor the strxform functions into SQL functions. Refactor the db_generic_query_view() routine. Fix multiple security vulnerabilities. Bring the code closer into compliance with style guidelines. by drh on 2008-02-07 15:08:02. [view]

To:

File src/db.c part of check-in [5cc845cfeb] - Rename the 'clearsign' setting to 'pgp-command'. Remove the 'safemerge' setting - safemerge is on by default and cannot be disabled. by drh on 2008-02-08 21:42:46. [view]

@@ -758,9 +758,8 @@
       " VALUES('project-code', lower(hex(randomblob(20))));"
     );
   }
   if( !db_is_global("autosync") ) db_set_int("autosync", 1, 0);
-  if( !db_is_global("safemerge") ) db_set_int("safemerge", 0, 0);
   if( !db_is_global("localauth") ) db_set_int("localauth", 0, 0);
   zUser = db_get("default-user", 0);
   if( zUser==0 ){
 #ifdef __MINGW32__
@@ -1053,9 +1052,9 @@
 **    autosync         If enabled, automatically pull prior to
 **                     commit or update and automatically push
 **                     after commit or tag or branch creation.
 **
-**    clearsign        Command used to clear-sign manifests at check-in.
+**    pgp-command      Command used to clear-sign manifests at check-in.
 **                     The default is "gpg --clearsign -o ".
 **
 **    editor           Text editor command used for check-in comments.
 **
@@ -1066,26 +1065,21 @@
 **
 **    omitsign         When enabled, fossil will not attempt to sign any
 **                     commit with gpg. All commits will be unsigned.
 **
-**    safemerge        If enabled, when commit will cause a fork, the
-**                     commit will not abort with warning. Also update
-**                     will not be allowed if local changes exist.
-**
-**   diff-command      External command to run when performing a diff.
+**    diff-command     External command to run when performing a diff.
 **                     If undefined, the internal text diff will be used.
 **
-**   gdiff-command     External command to run when performing a graphical
+**    gdiff-command    External command to run when performing a graphical
 **                     diff. If undefined, text diff will be used.
 */
 void setting_cmd(void){
   static const char *azName[] = {
     "autosync",
-    "clearsign",
+    "pgp-command",
     "editor",
     "localauth",
     "omitsign",
-    "safemerge",
     "diff-command",
     "gdiff-command",
   };
   int i;