Fossil SCM
Fix a bug in the sub-repository detection logic. Ticket [b733bba0b7319ef2].
Commit
e56a4ec3ad16e337cdc68b27d73b48dbb275001f
Parent
74c86dd1da61adf…
1 file changed
+2
-2
+2
-2
| --- src/vfile.c | ||
| +++ src/vfile.c | ||
| @@ -301,15 +301,15 @@ | ||
| 301 | 301 | */ |
| 302 | 302 | int vfile_top_of_checkout(const char *zPath){ |
| 303 | 303 | char *zFile; |
| 304 | 304 | int fileFound = 0; |
| 305 | 305 | |
| 306 | - zFile = mprintf("%s/_FOSSIL_"); | |
| 306 | + zFile = mprintf("%s/_FOSSIL_", zPath); | |
| 307 | 307 | fileFound = file_size(zFile)>=1024; |
| 308 | 308 | fossil_free(zFile); |
| 309 | 309 | if( !fileFound ){ |
| 310 | - zFile = mprintf("%s/.fos"); | |
| 310 | + zFile = mprintf("%s/.fos", zPath); | |
| 311 | 311 | fileFound = file_size(zFile)>=1024; |
| 312 | 312 | fossil_free(zFile); |
| 313 | 313 | } |
| 314 | 314 | return fileFound; |
| 315 | 315 | } |
| 316 | 316 |
| --- src/vfile.c | |
| +++ src/vfile.c | |
| @@ -301,15 +301,15 @@ | |
| 301 | */ |
| 302 | int vfile_top_of_checkout(const char *zPath){ |
| 303 | char *zFile; |
| 304 | int fileFound = 0; |
| 305 | |
| 306 | zFile = mprintf("%s/_FOSSIL_"); |
| 307 | fileFound = file_size(zFile)>=1024; |
| 308 | fossil_free(zFile); |
| 309 | if( !fileFound ){ |
| 310 | zFile = mprintf("%s/.fos"); |
| 311 | fileFound = file_size(zFile)>=1024; |
| 312 | fossil_free(zFile); |
| 313 | } |
| 314 | return fileFound; |
| 315 | } |
| 316 |
| --- src/vfile.c | |
| +++ src/vfile.c | |
| @@ -301,15 +301,15 @@ | |
| 301 | */ |
| 302 | int vfile_top_of_checkout(const char *zPath){ |
| 303 | char *zFile; |
| 304 | int fileFound = 0; |
| 305 | |
| 306 | zFile = mprintf("%s/_FOSSIL_", zPath); |
| 307 | fileFound = file_size(zFile)>=1024; |
| 308 | fossil_free(zFile); |
| 309 | if( !fileFound ){ |
| 310 | zFile = mprintf("%s/.fos", zPath); |
| 311 | fileFound = file_size(zFile)>=1024; |
| 312 | fossil_free(zFile); |
| 313 | } |
| 314 | return fileFound; |
| 315 | } |
| 316 |