Fossil SCM
Fix a bug in the 'commit' command that made it ignore the 'forbid-delta-manifests' setting.
Commit
ead01b6f27f9b413f6e07fbfaecbfaf2b5ab5ece0164e356a206be0061567702
Parent
4ba37b1c1437376…
1 file changed
+1
-1
+1
-1
| --- src/checkin.c | ||
| +++ src/checkin.c | ||
| @@ -2252,10 +2252,11 @@ | ||
| 2252 | 2252 | useHash = find_option("hash",0,0)!=0 || find_option("sha1sum",0,0)!=0; |
| 2253 | 2253 | noSign = find_option("nosign",0,0)!=0; |
| 2254 | 2254 | privateFlag = find_option("private",0,0)!=0; |
| 2255 | 2255 | forceDelta = find_option("delta",0,0)!=0; |
| 2256 | 2256 | forceBaseline = find_option("baseline",0,0)!=0; |
| 2257 | + db_must_be_within_tree(); | |
| 2257 | 2258 | if( forceDelta ){ |
| 2258 | 2259 | if( forceBaseline ){ |
| 2259 | 2260 | fossil_fatal("cannot use --delta and --baseline together"); |
| 2260 | 2261 | } |
| 2261 | 2262 | if( db_get_boolean("forbid-delta-manifests",0) ){ |
| @@ -2296,11 +2297,10 @@ | ||
| 2296 | 2297 | sCiInfo.azTag[nTag] = 0; |
| 2297 | 2298 | } |
| 2298 | 2299 | zComFile = find_option("message-file", "M", 1); |
| 2299 | 2300 | sCiInfo.zDateOvrd = find_option("date-override",0,1); |
| 2300 | 2301 | sCiInfo.zUserOvrd = find_option("user-override",0,1); |
| 2301 | - db_must_be_within_tree(); | |
| 2302 | 2302 | noSign = db_get_boolean("omitsign", 0)|noSign; |
| 2303 | 2303 | if( db_get_boolean("clearsign", 0)==0 ){ noSign = 1; } |
| 2304 | 2304 | useCksum = db_get_boolean("repo-cksum", 1); |
| 2305 | 2305 | bIgnoreSkew = find_option("ignore-clock-skew",0,0)!=0; |
| 2306 | 2306 | outputManifest = db_get_manifest_setting(); |
| 2307 | 2307 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -2252,10 +2252,11 @@ | |
| 2252 | useHash = find_option("hash",0,0)!=0 || find_option("sha1sum",0,0)!=0; |
| 2253 | noSign = find_option("nosign",0,0)!=0; |
| 2254 | privateFlag = find_option("private",0,0)!=0; |
| 2255 | forceDelta = find_option("delta",0,0)!=0; |
| 2256 | forceBaseline = find_option("baseline",0,0)!=0; |
| 2257 | if( forceDelta ){ |
| 2258 | if( forceBaseline ){ |
| 2259 | fossil_fatal("cannot use --delta and --baseline together"); |
| 2260 | } |
| 2261 | if( db_get_boolean("forbid-delta-manifests",0) ){ |
| @@ -2296,11 +2297,10 @@ | |
| 2296 | sCiInfo.azTag[nTag] = 0; |
| 2297 | } |
| 2298 | zComFile = find_option("message-file", "M", 1); |
| 2299 | sCiInfo.zDateOvrd = find_option("date-override",0,1); |
| 2300 | sCiInfo.zUserOvrd = find_option("user-override",0,1); |
| 2301 | db_must_be_within_tree(); |
| 2302 | noSign = db_get_boolean("omitsign", 0)|noSign; |
| 2303 | if( db_get_boolean("clearsign", 0)==0 ){ noSign = 1; } |
| 2304 | useCksum = db_get_boolean("repo-cksum", 1); |
| 2305 | bIgnoreSkew = find_option("ignore-clock-skew",0,0)!=0; |
| 2306 | outputManifest = db_get_manifest_setting(); |
| 2307 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -2252,10 +2252,11 @@ | |
| 2252 | useHash = find_option("hash",0,0)!=0 || find_option("sha1sum",0,0)!=0; |
| 2253 | noSign = find_option("nosign",0,0)!=0; |
| 2254 | privateFlag = find_option("private",0,0)!=0; |
| 2255 | forceDelta = find_option("delta",0,0)!=0; |
| 2256 | forceBaseline = find_option("baseline",0,0)!=0; |
| 2257 | db_must_be_within_tree(); |
| 2258 | if( forceDelta ){ |
| 2259 | if( forceBaseline ){ |
| 2260 | fossil_fatal("cannot use --delta and --baseline together"); |
| 2261 | } |
| 2262 | if( db_get_boolean("forbid-delta-manifests",0) ){ |
| @@ -2296,11 +2297,10 @@ | |
| 2297 | sCiInfo.azTag[nTag] = 0; |
| 2298 | } |
| 2299 | zComFile = find_option("message-file", "M", 1); |
| 2300 | sCiInfo.zDateOvrd = find_option("date-override",0,1); |
| 2301 | sCiInfo.zUserOvrd = find_option("user-override",0,1); |
| 2302 | noSign = db_get_boolean("omitsign", 0)|noSign; |
| 2303 | if( db_get_boolean("clearsign", 0)==0 ){ noSign = 1; } |
| 2304 | useCksum = db_get_boolean("repo-cksum", 1); |
| 2305 | bIgnoreSkew = find_option("ignore-clock-skew",0,0)!=0; |
| 2306 | outputManifest = db_get_manifest_setting(); |
| 2307 |