Fossil SCM
Bug-fix (not caused by refactoring, was already there): When doing a "fossil commit -n": assertion "blob_is_reset(&manifest)" failed: file "./src/checkin.c", line 1817, function: commit_cmd Aborted (core dumped)
Commit
3db05280caba9cbee0574857eebd041a54f36d66
Parent
ee598d69be04826…
1 file changed
+3
-3
+3
-3
| --- src/checkin.c | ||
| +++ src/checkin.c | ||
| @@ -1808,13 +1808,13 @@ | ||
| 1808 | 1808 | fossil_fatal("trouble committing manifest: %s", g.zErrMsg); |
| 1809 | 1809 | } |
| 1810 | 1810 | db_multi_exec("INSERT OR IGNORE INTO unsent VALUES(%d)", nvid); |
| 1811 | 1811 | if( !dryRunFlag ){ |
| 1812 | 1812 | xfer_run_common_script(); |
| 1813 | - if( manifest_crosslink(nvid, &manifest)==0 ){ | |
| 1814 | - fossil_fatal("%s\n", g.zErrMsg); | |
| 1815 | - } | |
| 1813 | + } | |
| 1814 | + if( manifest_crosslink(nvid, &manifest)==0 ){ | |
| 1815 | + fossil_fatal("%s\n", g.zErrMsg); | |
| 1816 | 1816 | } |
| 1817 | 1817 | assert( blob_is_reset(&manifest) ); |
| 1818 | 1818 | content_deltify(vid, nvid, 0); |
| 1819 | 1819 | zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", nvid); |
| 1820 | 1820 | |
| 1821 | 1821 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -1808,13 +1808,13 @@ | |
| 1808 | fossil_fatal("trouble committing manifest: %s", g.zErrMsg); |
| 1809 | } |
| 1810 | db_multi_exec("INSERT OR IGNORE INTO unsent VALUES(%d)", nvid); |
| 1811 | if( !dryRunFlag ){ |
| 1812 | xfer_run_common_script(); |
| 1813 | if( manifest_crosslink(nvid, &manifest)==0 ){ |
| 1814 | fossil_fatal("%s\n", g.zErrMsg); |
| 1815 | } |
| 1816 | } |
| 1817 | assert( blob_is_reset(&manifest) ); |
| 1818 | content_deltify(vid, nvid, 0); |
| 1819 | zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", nvid); |
| 1820 | |
| 1821 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -1808,13 +1808,13 @@ | |
| 1808 | fossil_fatal("trouble committing manifest: %s", g.zErrMsg); |
| 1809 | } |
| 1810 | db_multi_exec("INSERT OR IGNORE INTO unsent VALUES(%d)", nvid); |
| 1811 | if( !dryRunFlag ){ |
| 1812 | xfer_run_common_script(); |
| 1813 | } |
| 1814 | if( manifest_crosslink(nvid, &manifest)==0 ){ |
| 1815 | fossil_fatal("%s\n", g.zErrMsg); |
| 1816 | } |
| 1817 | assert( blob_is_reset(&manifest) ); |
| 1818 | content_deltify(vid, nvid, 0); |
| 1819 | zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", nvid); |
| 1820 | |
| 1821 |