Fossil SCM
Cherrypick [d8a588ba765ae5be]: Check for "clearsign" option in "fossil branch" command. Reported by J. van den Hoff.
Commit
21904cec14fe8b4e7a80be821f414e5b10dbb1d3
Parent
5d33c3b8878a9ac…
1 file changed
+2
-1
+2
-1
| --- src/branch.c | ||
| +++ src/branch.c | ||
| @@ -51,11 +51,12 @@ | ||
| 51 | 51 | verify_all_options(); |
| 52 | 52 | if( g.argc<5 ){ |
| 53 | 53 | usage("new BRANCH-NAME BASIS ?OPTIONS?"); |
| 54 | 54 | } |
| 55 | 55 | db_find_and_open_repository(0, 0); |
| 56 | - noSign = db_get_int("omitsign", 0)|noSign; | |
| 56 | + noSign = db_get_boolean("omitsign", 0)|noSign; | |
| 57 | + if( db_get_boolean("clearsign", 0)==0 ){ noSign = 1; } | |
| 57 | 58 | |
| 58 | 59 | /* fossil branch new name */ |
| 59 | 60 | zBranch = g.argv[3]; |
| 60 | 61 | if( zBranch==0 || zBranch[0]==0 ){ |
| 61 | 62 | fossil_fatal("branch name cannot be empty"); |
| 62 | 63 |
| --- src/branch.c | |
| +++ src/branch.c | |
| @@ -51,11 +51,12 @@ | |
| 51 | verify_all_options(); |
| 52 | if( g.argc<5 ){ |
| 53 | usage("new BRANCH-NAME BASIS ?OPTIONS?"); |
| 54 | } |
| 55 | db_find_and_open_repository(0, 0); |
| 56 | noSign = db_get_int("omitsign", 0)|noSign; |
| 57 | |
| 58 | /* fossil branch new name */ |
| 59 | zBranch = g.argv[3]; |
| 60 | if( zBranch==0 || zBranch[0]==0 ){ |
| 61 | fossil_fatal("branch name cannot be empty"); |
| 62 |
| --- src/branch.c | |
| +++ src/branch.c | |
| @@ -51,11 +51,12 @@ | |
| 51 | verify_all_options(); |
| 52 | if( g.argc<5 ){ |
| 53 | usage("new BRANCH-NAME BASIS ?OPTIONS?"); |
| 54 | } |
| 55 | db_find_and_open_repository(0, 0); |
| 56 | noSign = db_get_boolean("omitsign", 0)|noSign; |
| 57 | if( db_get_boolean("clearsign", 0)==0 ){ noSign = 1; } |
| 58 | |
| 59 | /* fossil branch new name */ |
| 60 | zBranch = g.argv[3]; |
| 61 | if( zBranch==0 || zBranch[0]==0 ){ |
| 62 | fossil_fatal("branch name cannot be empty"); |
| 63 |