Fossil SCM
Use verify_all_options() with fossil branch ls/lsh.
Commit
34e0f6817ab1682cd856dd26a76a08761d6b733de7ca4d47e9a90c6529c66c9c
Parent
119cc37ac5db72b…
1 file changed
+1
-4
+1
-4
| --- src/branch.c | ||
| +++ src/branch.c | ||
| @@ -738,10 +738,11 @@ | ||
| 738 | 738 | fossil_fatal("flags --username and --self are mutually exclusive"); |
| 739 | 739 | } |
| 740 | 740 | user_select(); |
| 741 | 741 | zUser = login_name(); |
| 742 | 742 | } |
| 743 | + verify_all_options(); | |
| 743 | 744 | |
| 744 | 745 | if ( (brFlags & BRL_MERGED) && (brFlags & BRL_UNMERGED) ){ |
| 745 | 746 | fossil_fatal("flags --merged and --unmerged are mutually exclusive"); |
| 746 | 747 | } |
| 747 | 748 | if( zUsersOpt ){ |
| @@ -753,14 +754,10 @@ | ||
| 753 | 754 | if( g.argc>4 || (g.argc==4 && (nLimit = atoi(g.argv[3]))==0) ){ |
| 754 | 755 | fossil_fatal("the lsh subcommand allows one optional numeric argument"); |
| 755 | 756 | } |
| 756 | 757 | brFlags |= BRL_ORDERBY_MTIME; |
| 757 | 758 | }else{ |
| 758 | - if( (g.argc == 4 || g.argc == 5) | |
| 759 | - && fossil_strcmp(g.argv[g.argc-1], "--users") == 0 ){ | |
| 760 | - fossil_fatal("Missing argument for --users"); | |
| 761 | - } | |
| 762 | 759 | if( g.argc >= 4 ) zBrNameGlob = g.argv[3]; |
| 763 | 760 | } |
| 764 | 761 | |
| 765 | 762 | if( g.localOpen ){ |
| 766 | 763 | vid = db_lget_int("checkout", 0); |
| 767 | 764 |
| --- src/branch.c | |
| +++ src/branch.c | |
| @@ -738,10 +738,11 @@ | |
| 738 | fossil_fatal("flags --username and --self are mutually exclusive"); |
| 739 | } |
| 740 | user_select(); |
| 741 | zUser = login_name(); |
| 742 | } |
| 743 | |
| 744 | if ( (brFlags & BRL_MERGED) && (brFlags & BRL_UNMERGED) ){ |
| 745 | fossil_fatal("flags --merged and --unmerged are mutually exclusive"); |
| 746 | } |
| 747 | if( zUsersOpt ){ |
| @@ -753,14 +754,10 @@ | |
| 753 | if( g.argc>4 || (g.argc==4 && (nLimit = atoi(g.argv[3]))==0) ){ |
| 754 | fossil_fatal("the lsh subcommand allows one optional numeric argument"); |
| 755 | } |
| 756 | brFlags |= BRL_ORDERBY_MTIME; |
| 757 | }else{ |
| 758 | if( (g.argc == 4 || g.argc == 5) |
| 759 | && fossil_strcmp(g.argv[g.argc-1], "--users") == 0 ){ |
| 760 | fossil_fatal("Missing argument for --users"); |
| 761 | } |
| 762 | if( g.argc >= 4 ) zBrNameGlob = g.argv[3]; |
| 763 | } |
| 764 | |
| 765 | if( g.localOpen ){ |
| 766 | vid = db_lget_int("checkout", 0); |
| 767 |
| --- src/branch.c | |
| +++ src/branch.c | |
| @@ -738,10 +738,11 @@ | |
| 738 | fossil_fatal("flags --username and --self are mutually exclusive"); |
| 739 | } |
| 740 | user_select(); |
| 741 | zUser = login_name(); |
| 742 | } |
| 743 | verify_all_options(); |
| 744 | |
| 745 | if ( (brFlags & BRL_MERGED) && (brFlags & BRL_UNMERGED) ){ |
| 746 | fossil_fatal("flags --merged and --unmerged are mutually exclusive"); |
| 747 | } |
| 748 | if( zUsersOpt ){ |
| @@ -753,14 +754,10 @@ | |
| 754 | if( g.argc>4 || (g.argc==4 && (nLimit = atoi(g.argv[3]))==0) ){ |
| 755 | fossil_fatal("the lsh subcommand allows one optional numeric argument"); |
| 756 | } |
| 757 | brFlags |= BRL_ORDERBY_MTIME; |
| 758 | }else{ |
| 759 | if( g.argc >= 4 ) zBrNameGlob = g.argv[3]; |
| 760 | } |
| 761 | |
| 762 | if( g.localOpen ){ |
| 763 | vid = db_lget_int("checkout", 0); |
| 764 |