diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-07-27 00:13:15 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-07-27 00:13:15 +0300 |
| commit | 9a5e3b5f47098221023131c4e31cb53295211b5f (patch) | |
| tree | caecffc2012220b8fb8f62339438783b057f3b54 /builtin/branch.c | |
| parent | 914a353a128d4d885e138f189e235ad6094d436e (diff) | |
| parent | e12cb98e1e083c23a03fcfabb3a3c6a5a22ce3c5 (diff) | |
Merge branch 'jc/branch-parseopt-fix'
Command line parser fixes.
* jc/branch-parseopt-fix:
branch: reject "--no-all" and "--no-remotes" early
Diffstat (limited to 'builtin/branch.c')
| -rw-r--r-- | builtin/branch.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/builtin/branch.c b/builtin/branch.c index f9d5cef3b2..08da650516 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -720,8 +720,9 @@ int cmd_branch(int argc, const char **argv, const char *prefix) OPT_STRING('u', "set-upstream-to", &new_upstream, N_("upstream"), N_("change the upstream info")), OPT_BOOL(0, "unset-upstream", &unset_upstream, N_("unset the upstream info")), OPT__COLOR(&branch_use_color, N_("use colored output")), - OPT_SET_INT('r', "remotes", &filter.kind, N_("act on remote-tracking branches"), - FILTER_REFS_REMOTES), + OPT_SET_INT_F('r', "remotes", &filter.kind, N_("act on remote-tracking branches"), + FILTER_REFS_REMOTES, + PARSE_OPT_NONEG), OPT_CONTAINS(&filter.with_commit, N_("print only branches that contain the commit")), OPT_NO_CONTAINS(&filter.no_commit, N_("print only branches that don't contain the commit")), OPT_WITH(&filter.with_commit, N_("print only branches that contain the commit")), @@ -729,8 +730,9 @@ int cmd_branch(int argc, const char **argv, const char *prefix) OPT__ABBREV(&filter.abbrev), OPT_GROUP(N_("Specific git-branch actions:")), - OPT_SET_INT('a', "all", &filter.kind, N_("list both remote-tracking and local branches"), - FILTER_REFS_REMOTES | FILTER_REFS_BRANCHES), + OPT_SET_INT_F('a', "all", &filter.kind, N_("list both remote-tracking and local branches"), + FILTER_REFS_REMOTES | FILTER_REFS_BRANCHES, + PARSE_OPT_NONEG), OPT_BIT('d', "delete", &delete, N_("delete fully merged branch"), 1), OPT_BIT('D', NULL, &delete, N_("delete branch (even if not merged)"), 2), OPT_BIT('m', "move", &rename, N_("move/rename a branch and its reflog"), 1), |