Fossil SCM
Removed the "or --allow-fork" advice output from "fossil checkin" when forcing the checkin would fork the branch. It's good for Fossil to have this option, especially for automated tooling that needs to just bull forward blindly, but it's bad advice to give to interactive users. Let them discover it via --help, if they learn of it at all.
Commit
66d55e9b436c203e64e3db417ad358666e84d278f66d4a2b7cb8d4055ce7e768
Parent
1b2d6c30ba1ab06…
1 file changed
+2
-2
+2
-2
| --- src/checkin.c | ||
| +++ src/checkin.c | ||
| @@ -2272,18 +2272,18 @@ | ||
| 2272 | 2272 | */ |
| 2273 | 2273 | if( !vid ){ |
| 2274 | 2274 | if( sCiInfo.zBranch==0 ){ |
| 2275 | 2275 | if( allowFork==0 && forceFlag==0 && g.markPrivate==0 |
| 2276 | 2276 | && db_exists("SELECT 1 from event where type='ci'") ){ |
| 2277 | - fossil_fatal("would fork. \"update\" first or use --allow-fork."); | |
| 2277 | + fossil_fatal("would fork. \"update\" first."); | |
| 2278 | 2278 | } |
| 2279 | 2279 | sCiInfo.zBranch = db_get("main-branch", "trunk"); |
| 2280 | 2280 | } |
| 2281 | 2281 | }else if( sCiInfo.zBranch==0 && allowFork==0 && forceFlag==0 |
| 2282 | 2282 | && g.markPrivate==0 && !is_a_leaf(vid) |
| 2283 | 2283 | ){ |
| 2284 | - fossil_fatal("would fork. \"update\" first or use --allow-fork."); | |
| 2284 | + fossil_fatal("would fork. \"update\" first."); | |
| 2285 | 2285 | } |
| 2286 | 2286 | |
| 2287 | 2287 | /* |
| 2288 | 2288 | ** Do not allow a commit against a closed leaf unless the commit |
| 2289 | 2289 | ** ends up on a different branch. |
| 2290 | 2290 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -2272,18 +2272,18 @@ | |
| 2272 | */ |
| 2273 | if( !vid ){ |
| 2274 | if( sCiInfo.zBranch==0 ){ |
| 2275 | if( allowFork==0 && forceFlag==0 && g.markPrivate==0 |
| 2276 | && db_exists("SELECT 1 from event where type='ci'") ){ |
| 2277 | fossil_fatal("would fork. \"update\" first or use --allow-fork."); |
| 2278 | } |
| 2279 | sCiInfo.zBranch = db_get("main-branch", "trunk"); |
| 2280 | } |
| 2281 | }else if( sCiInfo.zBranch==0 && allowFork==0 && forceFlag==0 |
| 2282 | && g.markPrivate==0 && !is_a_leaf(vid) |
| 2283 | ){ |
| 2284 | fossil_fatal("would fork. \"update\" first or use --allow-fork."); |
| 2285 | } |
| 2286 | |
| 2287 | /* |
| 2288 | ** Do not allow a commit against a closed leaf unless the commit |
| 2289 | ** ends up on a different branch. |
| 2290 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -2272,18 +2272,18 @@ | |
| 2272 | */ |
| 2273 | if( !vid ){ |
| 2274 | if( sCiInfo.zBranch==0 ){ |
| 2275 | if( allowFork==0 && forceFlag==0 && g.markPrivate==0 |
| 2276 | && db_exists("SELECT 1 from event where type='ci'") ){ |
| 2277 | fossil_fatal("would fork. \"update\" first."); |
| 2278 | } |
| 2279 | sCiInfo.zBranch = db_get("main-branch", "trunk"); |
| 2280 | } |
| 2281 | }else if( sCiInfo.zBranch==0 && allowFork==0 && forceFlag==0 |
| 2282 | && g.markPrivate==0 && !is_a_leaf(vid) |
| 2283 | ){ |
| 2284 | fossil_fatal("would fork. \"update\" first."); |
| 2285 | } |
| 2286 | |
| 2287 | /* |
| 2288 | ** Do not allow a commit against a closed leaf unless the commit |
| 2289 | ** ends up on a different branch. |
| 2290 |