Fossil SCM

Fix an issue with the logic that prevents Fossil control artifacts from being imported as regular files. Probably unrelated to the breezy changes. Came up during testing.

drh 2020-10-01 12:46 breezy-fast-import
Commit 92ab2474355296c0049f64fe84e7f1f207a9a00d491ed0be25469ff00c1c9a91
1 file changed +1 -1
+1 -1
--- src/import.c
+++ src/import.c
@@ -210,11 +210,11 @@
210210
** artifact. Then add the file to the repository.
211211
*/
212212
static void check_and_add_file(const char *zMark, ImportFile *pFile){
213213
Blob content;
214214
blob_init(&content, gg.aData, gg.nData);
215
- if( manifest_is_well_formed(gg.aData, gg.nData) ){
215
+ if( gg.nData && manifest_is_well_formed(gg.aData, gg.nData) ){
216216
sterilize_manifest(&content, -1);
217217
}
218218
fast_insert_content(&content, zMark, pFile, 0, 0);
219219
blob_reset(&content);
220220
}
221221
--- src/import.c
+++ src/import.c
@@ -210,11 +210,11 @@
210 ** artifact. Then add the file to the repository.
211 */
212 static void check_and_add_file(const char *zMark, ImportFile *pFile){
213 Blob content;
214 blob_init(&content, gg.aData, gg.nData);
215 if( manifest_is_well_formed(gg.aData, gg.nData) ){
216 sterilize_manifest(&content, -1);
217 }
218 fast_insert_content(&content, zMark, pFile, 0, 0);
219 blob_reset(&content);
220 }
221
--- src/import.c
+++ src/import.c
@@ -210,11 +210,11 @@
210 ** artifact. Then add the file to the repository.
211 */
212 static void check_and_add_file(const char *zMark, ImportFile *pFile){
213 Blob content;
214 blob_init(&content, gg.aData, gg.nData);
215 if( gg.nData && manifest_is_well_formed(gg.aData, gg.nData) ){
216 sterilize_manifest(&content, -1);
217 }
218 fast_insert_content(&content, zMark, pFile, 0, 0);
219 blob_reset(&content);
220 }
221

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button