Fossil SCM
Fix the "add" command so that it will undo a prior "rm". Ticket [34707fabfd8a5d]
Commit
feed6232af207151a9a5dc54619d3a98646d4a8b
Parent
c4ade4365157e9c…
1 file changed
+2
-3
+2
-3
| --- src/add.c | ||
| +++ src/add.c | ||
| @@ -245,13 +245,12 @@ | ||
| 245 | 245 | }else if( file_access(zName, R_OK) ){ |
| 246 | 246 | fossil_fatal("cannot open %s", zName); |
| 247 | 247 | }else{ |
| 248 | 248 | char *zTreeName = &zName[nRoot]; |
| 249 | 249 | db_multi_exec( |
| 250 | - "INSERT OR IGNORE INTO sfile(x)" | |
| 251 | - " SELECT %Q WHERE NOT EXISTS(SELECT 1 FROM vfile WHERE pathname=%Q)", | |
| 252 | - zTreeName, zTreeName | |
| 250 | + "INSERT OR IGNORE INTO sfile(x) VALUES(%Q)", | |
| 251 | + zTreeName | |
| 253 | 252 | ); |
| 254 | 253 | } |
| 255 | 254 | blob_reset(&fullName); |
| 256 | 255 | } |
| 257 | 256 | glob_free(pIgnore); |
| 258 | 257 |
| --- src/add.c | |
| +++ src/add.c | |
| @@ -245,13 +245,12 @@ | |
| 245 | }else if( file_access(zName, R_OK) ){ |
| 246 | fossil_fatal("cannot open %s", zName); |
| 247 | }else{ |
| 248 | char *zTreeName = &zName[nRoot]; |
| 249 | db_multi_exec( |
| 250 | "INSERT OR IGNORE INTO sfile(x)" |
| 251 | " SELECT %Q WHERE NOT EXISTS(SELECT 1 FROM vfile WHERE pathname=%Q)", |
| 252 | zTreeName, zTreeName |
| 253 | ); |
| 254 | } |
| 255 | blob_reset(&fullName); |
| 256 | } |
| 257 | glob_free(pIgnore); |
| 258 |
| --- src/add.c | |
| +++ src/add.c | |
| @@ -245,13 +245,12 @@ | |
| 245 | }else if( file_access(zName, R_OK) ){ |
| 246 | fossil_fatal("cannot open %s", zName); |
| 247 | }else{ |
| 248 | char *zTreeName = &zName[nRoot]; |
| 249 | db_multi_exec( |
| 250 | "INSERT OR IGNORE INTO sfile(x) VALUES(%Q)", |
| 251 | zTreeName |
| 252 | ); |
| 253 | } |
| 254 | blob_reset(&fullName); |
| 255 | } |
| 256 | glob_free(pIgnore); |
| 257 |