Fossil SCM
commit not longer requires a comment (it uses a placeholder) when in dry-run mode, per ML request.
Commit
75e042503bfe90144f7d6914aac9b6b3156cfa1a
Parent
4aaf5dc5ecdd0a3…
1 file changed
+5
+5
| --- src/checkin.c | ||
| +++ src/checkin.c | ||
| @@ -1526,10 +1526,15 @@ | ||
| 1526 | 1526 | blob_append(&comment, zComment, -1); |
| 1527 | 1527 | }else if( zComFile ){ |
| 1528 | 1528 | blob_zero(&comment); |
| 1529 | 1529 | blob_read_from_file(&comment, zComFile); |
| 1530 | 1530 | blob_to_utf8_no_bom(&comment, 1); |
| 1531 | + }else if(dryRunFlag){ | |
| 1532 | + blob_zero(&comment); | |
| 1533 | + blob_append(&comment, "Dry-run mode - no comment provided.", -1) | |
| 1534 | + /* Comment needed to avoid downstream assertion. */ | |
| 1535 | + ; | |
| 1531 | 1536 | }else{ |
| 1532 | 1537 | char *zInit = db_text(0, "SELECT value FROM vvar WHERE name='ci-comment'"); |
| 1533 | 1538 | prepare_commit_comment(&comment, zInit, &sCiInfo, vid); |
| 1534 | 1539 | if( zInit && zInit[0] && fossil_strcmp(zInit, blob_str(&comment))==0 ){ |
| 1535 | 1540 | blob_zero(&ans); |
| 1536 | 1541 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -1526,10 +1526,15 @@ | |
| 1526 | blob_append(&comment, zComment, -1); |
| 1527 | }else if( zComFile ){ |
| 1528 | blob_zero(&comment); |
| 1529 | blob_read_from_file(&comment, zComFile); |
| 1530 | blob_to_utf8_no_bom(&comment, 1); |
| 1531 | }else{ |
| 1532 | char *zInit = db_text(0, "SELECT value FROM vvar WHERE name='ci-comment'"); |
| 1533 | prepare_commit_comment(&comment, zInit, &sCiInfo, vid); |
| 1534 | if( zInit && zInit[0] && fossil_strcmp(zInit, blob_str(&comment))==0 ){ |
| 1535 | blob_zero(&ans); |
| 1536 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -1526,10 +1526,15 @@ | |
| 1526 | blob_append(&comment, zComment, -1); |
| 1527 | }else if( zComFile ){ |
| 1528 | blob_zero(&comment); |
| 1529 | blob_read_from_file(&comment, zComFile); |
| 1530 | blob_to_utf8_no_bom(&comment, 1); |
| 1531 | }else if(dryRunFlag){ |
| 1532 | blob_zero(&comment); |
| 1533 | blob_append(&comment, "Dry-run mode - no comment provided.", -1) |
| 1534 | /* Comment needed to avoid downstream assertion. */ |
| 1535 | ; |
| 1536 | }else{ |
| 1537 | char *zInit = db_text(0, "SELECT value FROM vvar WHERE name='ci-comment'"); |
| 1538 | prepare_commit_comment(&comment, zInit, &sCiInfo, vid); |
| 1539 | if( zInit && zInit[0] && fossil_strcmp(zInit, blob_str(&comment))==0 ){ |
| 1540 | blob_zero(&ans); |
| 1541 |