Differences From:
File
src/db.c
part of check-in
[3cdb768fca]
- Do not attempt to access the global_config table if the ~/.fossil database
has not been opened.
by
drh on
2007-10-06 16:40:48.
[view]
To:
File
src/db.c
part of check-in
[a21806dcf3]
- Fixed omitsign discrepancies. Windows version now looks for USERNAME instead of USER when creating new database.
by
jnc on
2007-10-07 14:38:54.
[view]
@@ -699,9 +699,13 @@
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__
+ zUser = getenv("USERNAME");
+#else
zUser = getenv("USER");
+#endif
}
if( zUser==0 ){
zUser = "root";
}
@@ -973,9 +977,9 @@
** autosync If enabled, automatically pull prior to
** commit or update and automatically push
** after commit or tag or branch creation.
**
-** clear-sign Command used to clear-sign manifests at check-in.
+** clearsign Command used to clear-sign manifests at check-in.
** The default is "gpg --clearsign -o ".
**
** editor Text editor command used for check-in comments.
**
@@ -983,9 +987,9 @@
** 127.0.0.1 be authenticated by password. If
** false, all HTTP requests from localhost have
** unrestricted access to the repository.
**
-** omit-sign When enabled, fossil will not attempt to sign any
+** 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
@@ -996,9 +1000,9 @@
"autosync",
"clearsign",
"editor",
"localauth",
- "omitsig",
+ "omitsign",
"safemerge",
};
int i;
int globalFlag = find_option("global","g",0)!=0;