Fossil SCM
On the test-integrity command, make a blob size mismatch a warning, not a fatal error.
Commit
88f2715f360873357b89bbe9cbc89848ee26b086
Parent
4ba6a2c96f1a5ae…
1 file changed
+2
-2
+2
-2
| --- src/content.c | ||
| +++ src/content.c | ||
| @@ -777,12 +777,12 @@ | ||
| 777 | 777 | printf("skip phantom %d %s\n", rid, zUuid); |
| 778 | 778 | continue; /* Ignore phantoms */ |
| 779 | 779 | } |
| 780 | 780 | content_get(rid, &content); |
| 781 | 781 | if( blob_size(&content)!=size ){ |
| 782 | - fossil_fatal("size mismatch on blob rid=%d: %d vs %d", | |
| 783 | - rid, blob_size(&content), size); | |
| 782 | + fossil_warning("size mismatch on blob rid=%d: %d vs %d", | |
| 783 | + rid, blob_size(&content), size); | |
| 784 | 784 | } |
| 785 | 785 | sha1sum_blob(&content, &cksum); |
| 786 | 786 | if( strcmp(blob_str(&cksum), zUuid)!=0 ){ |
| 787 | 787 | fossil_fatal("checksum mismatch on blob rid=%d: %s vs %s", |
| 788 | 788 | rid, blob_str(&cksum), zUuid); |
| 789 | 789 |
| --- src/content.c | |
| +++ src/content.c | |
| @@ -777,12 +777,12 @@ | |
| 777 | printf("skip phantom %d %s\n", rid, zUuid); |
| 778 | continue; /* Ignore phantoms */ |
| 779 | } |
| 780 | content_get(rid, &content); |
| 781 | if( blob_size(&content)!=size ){ |
| 782 | fossil_fatal("size mismatch on blob rid=%d: %d vs %d", |
| 783 | rid, blob_size(&content), size); |
| 784 | } |
| 785 | sha1sum_blob(&content, &cksum); |
| 786 | if( strcmp(blob_str(&cksum), zUuid)!=0 ){ |
| 787 | fossil_fatal("checksum mismatch on blob rid=%d: %s vs %s", |
| 788 | rid, blob_str(&cksum), zUuid); |
| 789 |
| --- src/content.c | |
| +++ src/content.c | |
| @@ -777,12 +777,12 @@ | |
| 777 | printf("skip phantom %d %s\n", rid, zUuid); |
| 778 | continue; /* Ignore phantoms */ |
| 779 | } |
| 780 | content_get(rid, &content); |
| 781 | if( blob_size(&content)!=size ){ |
| 782 | fossil_warning("size mismatch on blob rid=%d: %d vs %d", |
| 783 | rid, blob_size(&content), size); |
| 784 | } |
| 785 | sha1sum_blob(&content, &cksum); |
| 786 | if( strcmp(blob_str(&cksum), zUuid)!=0 ){ |
| 787 | fossil_fatal("checksum mismatch on blob rid=%d: %s vs %s", |
| 788 | rid, blob_str(&cksum), zUuid); |
| 789 |