Fossil SCM
Fix for checkin --verbose error reported in [forum:9cd41258f9|forum post 9cd41258f9]. Problem introduced in [caa6ad39db443929].
Commit
77e1f8670d42049bb982ac8af01e9d13cdb36ed89da9bf1c82d836cb683fb2ed
Parent
699b9ca54d8f305…
1 file changed
+2
-1
+2
-1
| --- src/checkin.c | ||
| +++ src/checkin.c | ||
| @@ -1502,11 +1502,12 @@ | ||
| 1502 | 1502 | int i; |
| 1503 | 1503 | for(i=0; g.aCommitFile[i]!=0; ++i){} |
| 1504 | 1504 | diffFiles = fossil_malloc_zero((i+1) * sizeof(*diffFiles)); |
| 1505 | 1505 | for(i=0; g.aCommitFile[i]!=0; ++i){ |
| 1506 | 1506 | blob_append_sql(&sql, |
| 1507 | - "SELECT pathname, deleted, rid WHERE id=%d", | |
| 1507 | + "SELECT pathname, deleted, rid " | |
| 1508 | + "FROM vfile WHERE id=%d", | |
| 1508 | 1509 | g.aCommitFile[i]); |
| 1509 | 1510 | db_prepare(&q, "%s", blob_sql_text(&sql)); |
| 1510 | 1511 | blob_reset(&sql); |
| 1511 | 1512 | assert( db_step(&q)==SQLITE_ROW ); |
| 1512 | 1513 | diffFiles[i].zName = fossil_strdup(db_column_text(&q, 0)); |
| 1513 | 1514 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -1502,11 +1502,12 @@ | |
| 1502 | int i; |
| 1503 | for(i=0; g.aCommitFile[i]!=0; ++i){} |
| 1504 | diffFiles = fossil_malloc_zero((i+1) * sizeof(*diffFiles)); |
| 1505 | for(i=0; g.aCommitFile[i]!=0; ++i){ |
| 1506 | blob_append_sql(&sql, |
| 1507 | "SELECT pathname, deleted, rid WHERE id=%d", |
| 1508 | g.aCommitFile[i]); |
| 1509 | db_prepare(&q, "%s", blob_sql_text(&sql)); |
| 1510 | blob_reset(&sql); |
| 1511 | assert( db_step(&q)==SQLITE_ROW ); |
| 1512 | diffFiles[i].zName = fossil_strdup(db_column_text(&q, 0)); |
| 1513 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -1502,11 +1502,12 @@ | |
| 1502 | int i; |
| 1503 | for(i=0; g.aCommitFile[i]!=0; ++i){} |
| 1504 | diffFiles = fossil_malloc_zero((i+1) * sizeof(*diffFiles)); |
| 1505 | for(i=0; g.aCommitFile[i]!=0; ++i){ |
| 1506 | blob_append_sql(&sql, |
| 1507 | "SELECT pathname, deleted, rid " |
| 1508 | "FROM vfile WHERE id=%d", |
| 1509 | g.aCommitFile[i]); |
| 1510 | db_prepare(&q, "%s", blob_sql_text(&sql)); |
| 1511 | blob_reset(&sql); |
| 1512 | assert( db_step(&q)==SQLITE_ROW ); |
| 1513 | diffFiles[i].zName = fossil_strdup(db_column_text(&q, 0)); |
| 1514 |