Fossil SCM

Per a /chat discussion in December, no longer "sterilize" manifests saved in zip/tar exports, as that changes their hash for client-side validation purposes and there is little risk of such exports being re-imported into a fossil repo.

stephan 2022-01-20 04:48 trunk
Commit 722c248d5381b3e8ccddbc203fe88ed42471f2fd600a21cb5791f0ce8122b3dd
2 files changed -1 -1
-1
--- src/tar.c
+++ src/tar.c
@@ -523,11 +523,10 @@
523523
if( eflg & MFESTFLG_RAW ){
524524
blob_append(&filename, "manifest", -1);
525525
zName = blob_str(&filename);
526526
if( listFlag ) fossil_print("%s\n", zName);
527527
if( pTar ){
528
- sterilize_manifest(&mfile, CFTYPE_MANIFEST);
529528
tar_add_file(zName, &mfile, 0, mTime);
530529
}
531530
}
532531
}
533532
blob_reset(&mfile);
534533
--- src/tar.c
+++ src/tar.c
@@ -523,11 +523,10 @@
523 if( eflg & MFESTFLG_RAW ){
524 blob_append(&filename, "manifest", -1);
525 zName = blob_str(&filename);
526 if( listFlag ) fossil_print("%s\n", zName);
527 if( pTar ){
528 sterilize_manifest(&mfile, CFTYPE_MANIFEST);
529 tar_add_file(zName, &mfile, 0, mTime);
530 }
531 }
532 }
533 blob_reset(&mfile);
534
--- src/tar.c
+++ src/tar.c
@@ -523,11 +523,10 @@
523 if( eflg & MFESTFLG_RAW ){
524 blob_append(&filename, "manifest", -1);
525 zName = blob_str(&filename);
526 if( listFlag ) fossil_print("%s\n", zName);
527 if( pTar ){
 
528 tar_add_file(zName, &mfile, 0, mTime);
529 }
530 }
531 }
532 blob_reset(&mfile);
533
-1
--- src/zip.c
+++ src/zip.c
@@ -677,11 +677,10 @@
677677
blob_append(&filename, "manifest", -1);
678678
zName = blob_str(&filename);
679679
if( listFlag ) fossil_print("%s\n", zName);
680680
if( pZip ){
681681
zip_add_folders(&sArchive, zName);
682
- sterilize_manifest(&mfile, CFTYPE_MANIFEST);
683682
zip_add_file(&sArchive, zName, &mfile, 0);
684683
}
685684
}
686685
if( eflg & MFESTFLG_UUID ){
687686
blob_append(&hash, "\n", 1);
688687
--- src/zip.c
+++ src/zip.c
@@ -677,11 +677,10 @@
677 blob_append(&filename, "manifest", -1);
678 zName = blob_str(&filename);
679 if( listFlag ) fossil_print("%s\n", zName);
680 if( pZip ){
681 zip_add_folders(&sArchive, zName);
682 sterilize_manifest(&mfile, CFTYPE_MANIFEST);
683 zip_add_file(&sArchive, zName, &mfile, 0);
684 }
685 }
686 if( eflg & MFESTFLG_UUID ){
687 blob_append(&hash, "\n", 1);
688
--- src/zip.c
+++ src/zip.c
@@ -677,11 +677,10 @@
677 blob_append(&filename, "manifest", -1);
678 zName = blob_str(&filename);
679 if( listFlag ) fossil_print("%s\n", zName);
680 if( pZip ){
681 zip_add_folders(&sArchive, zName);
 
682 zip_add_file(&sArchive, zName, &mfile, 0);
683 }
684 }
685 if( eflg & MFESTFLG_UUID ){
686 blob_append(&hash, "\n", 1);
687

Keyboard Shortcuts

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