Fossil SCM
During open, only refresh the 'allow-symlinks' setting if there is an open revision.
Commit
65c23c63dbee20ccb866eacd9389dbbb0a934dc9
Parent
20972e804276322…
1 file changed
+6
-3
M
src/db.c
+6
-3
| --- src/db.c | ||
| +++ src/db.c | ||
| @@ -2245,12 +2245,15 @@ | ||
| 2245 | 2245 | }else if( db_exists("SELECT 1 FROM event WHERE type='ci'") ){ |
| 2246 | 2246 | g.zOpenRevision = db_get("main-branch", "trunk"); |
| 2247 | 2247 | } |
| 2248 | 2248 | } |
| 2249 | 2249 | |
| 2250 | - /* Update the allow-symlinks flag now that the revision is known. */ | |
| 2251 | - g.allowSymlinks = db_get_boolean("allow-symlinks", 0); | |
| 2250 | + if( g.zOpenRevision ){ | |
| 2251 | + /* Since the repository is open and we know the revision now, | |
| 2252 | + ** refresh the allow-symlinks flag. */ | |
| 2253 | + g.allowSymlinks = db_get_boolean("allow-symlinks", 0); | |
| 2254 | + } | |
| 2252 | 2255 | |
| 2253 | 2256 | #if defined(_WIN32) || defined(__CYGWIN__) |
| 2254 | 2257 | # define LOCALDB_NAME "./_FOSSIL_" |
| 2255 | 2258 | #else |
| 2256 | 2259 | # define LOCALDB_NAME "./.fslckout" |
| @@ -2269,11 +2272,11 @@ | ||
| 2269 | 2272 | oldArgc = g.argc; |
| 2270 | 2273 | azNewArgv[0] = g.argv[0]; |
| 2271 | 2274 | g.argv = azNewArgv; |
| 2272 | 2275 | if( !emptyFlag ){ |
| 2273 | 2276 | g.argc = 3; |
| 2274 | - if( g.zOpenRevision!=0 ){ | |
| 2277 | + if( g.zOpenRevision ){ | |
| 2275 | 2278 | azNewArgv[g.argc-1] = g.zOpenRevision; |
| 2276 | 2279 | }else{ |
| 2277 | 2280 | azNewArgv[g.argc-1] = "--latest"; |
| 2278 | 2281 | } |
| 2279 | 2282 | if( keepFlag ){ |
| 2280 | 2283 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -2245,12 +2245,15 @@ | |
| 2245 | }else if( db_exists("SELECT 1 FROM event WHERE type='ci'") ){ |
| 2246 | g.zOpenRevision = db_get("main-branch", "trunk"); |
| 2247 | } |
| 2248 | } |
| 2249 | |
| 2250 | /* Update the allow-symlinks flag now that the revision is known. */ |
| 2251 | g.allowSymlinks = db_get_boolean("allow-symlinks", 0); |
| 2252 | |
| 2253 | #if defined(_WIN32) || defined(__CYGWIN__) |
| 2254 | # define LOCALDB_NAME "./_FOSSIL_" |
| 2255 | #else |
| 2256 | # define LOCALDB_NAME "./.fslckout" |
| @@ -2269,11 +2272,11 @@ | |
| 2269 | oldArgc = g.argc; |
| 2270 | azNewArgv[0] = g.argv[0]; |
| 2271 | g.argv = azNewArgv; |
| 2272 | if( !emptyFlag ){ |
| 2273 | g.argc = 3; |
| 2274 | if( g.zOpenRevision!=0 ){ |
| 2275 | azNewArgv[g.argc-1] = g.zOpenRevision; |
| 2276 | }else{ |
| 2277 | azNewArgv[g.argc-1] = "--latest"; |
| 2278 | } |
| 2279 | if( keepFlag ){ |
| 2280 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -2245,12 +2245,15 @@ | |
| 2245 | }else if( db_exists("SELECT 1 FROM event WHERE type='ci'") ){ |
| 2246 | g.zOpenRevision = db_get("main-branch", "trunk"); |
| 2247 | } |
| 2248 | } |
| 2249 | |
| 2250 | if( g.zOpenRevision ){ |
| 2251 | /* Since the repository is open and we know the revision now, |
| 2252 | ** refresh the allow-symlinks flag. */ |
| 2253 | g.allowSymlinks = db_get_boolean("allow-symlinks", 0); |
| 2254 | } |
| 2255 | |
| 2256 | #if defined(_WIN32) || defined(__CYGWIN__) |
| 2257 | # define LOCALDB_NAME "./_FOSSIL_" |
| 2258 | #else |
| 2259 | # define LOCALDB_NAME "./.fslckout" |
| @@ -2269,11 +2272,11 @@ | |
| 2272 | oldArgc = g.argc; |
| 2273 | azNewArgv[0] = g.argv[0]; |
| 2274 | g.argv = azNewArgv; |
| 2275 | if( !emptyFlag ){ |
| 2276 | g.argc = 3; |
| 2277 | if( g.zOpenRevision ){ |
| 2278 | azNewArgv[g.argc-1] = g.zOpenRevision; |
| 2279 | }else{ |
| 2280 | azNewArgv[g.argc-1] = "--latest"; |
| 2281 | } |
| 2282 | if( keepFlag ){ |
| 2283 |