Fossil SCM
Do not issue a warning about duplicate branch names when doing a --private check-in.
Commit
d7e45aae70b1e82684faf2e9d47a74ab545c2bf84b2c33b1afa0bd9afcf9b9d3
Parent
dbd96b2c74520c2…
1 file changed
+5
-1
+5
-1
| --- src/checkin.c | ||
| +++ src/checkin.c | ||
| @@ -2125,11 +2125,15 @@ | ||
| 2125 | 2125 | outputManifest = db_get_manifest_setting(); |
| 2126 | 2126 | verify_all_options(); |
| 2127 | 2127 | |
| 2128 | 2128 | /* Do not allow the creation of a new branch using an existing open |
| 2129 | 2129 | ** branch name unless the --force flag is used */ |
| 2130 | - if( sCiInfo.zBranch!=0 && !forceFlag && branch_is_open(sCiInfo.zBranch) ){ | |
| 2130 | + if( sCiInfo.zBranch!=0 | |
| 2131 | + && !forceFlag | |
| 2132 | + && fossil_strcmp(sCiInfo.zBranch,"private")!=0 | |
| 2133 | + && branch_is_open(sCiInfo.zBranch) | |
| 2134 | + ){ | |
| 2131 | 2135 | fossil_fatal("an open branch named \"%s\" already exists - use --force" |
| 2132 | 2136 | " to override", sCiInfo.zBranch); |
| 2133 | 2137 | } |
| 2134 | 2138 | |
| 2135 | 2139 | /* Escape special characters in tags and put all tags in sorted order */ |
| 2136 | 2140 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -2125,11 +2125,15 @@ | |
| 2125 | outputManifest = db_get_manifest_setting(); |
| 2126 | verify_all_options(); |
| 2127 | |
| 2128 | /* Do not allow the creation of a new branch using an existing open |
| 2129 | ** branch name unless the --force flag is used */ |
| 2130 | if( sCiInfo.zBranch!=0 && !forceFlag && branch_is_open(sCiInfo.zBranch) ){ |
| 2131 | fossil_fatal("an open branch named \"%s\" already exists - use --force" |
| 2132 | " to override", sCiInfo.zBranch); |
| 2133 | } |
| 2134 | |
| 2135 | /* Escape special characters in tags and put all tags in sorted order */ |
| 2136 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -2125,11 +2125,15 @@ | |
| 2125 | outputManifest = db_get_manifest_setting(); |
| 2126 | verify_all_options(); |
| 2127 | |
| 2128 | /* Do not allow the creation of a new branch using an existing open |
| 2129 | ** branch name unless the --force flag is used */ |
| 2130 | if( sCiInfo.zBranch!=0 |
| 2131 | && !forceFlag |
| 2132 | && fossil_strcmp(sCiInfo.zBranch,"private")!=0 |
| 2133 | && branch_is_open(sCiInfo.zBranch) |
| 2134 | ){ |
| 2135 | fossil_fatal("an open branch named \"%s\" already exists - use --force" |
| 2136 | " to override", sCiInfo.zBranch); |
| 2137 | } |
| 2138 | |
| 2139 | /* Escape special characters in tags and put all tags in sorted order */ |
| 2140 |