Re: [PATCH 3/3] branch: don't mix --edit-description
From: Junio C Hamano <hidden>
Date: 2020-06-17 18:09:49
Denton Liu [off-list ref] writes:
`git branch` accepts `--edit-description` in conjunction with other arguments. However, `--edit-description` is its own mode, similar to `--set-upstream-to`, which is also made mutually exclusive with other modes. Prevent `--edit-description` from being mixed with other modes.
Makes sense. Do we have some "these options are mutually exclusive" test? It makes me wonder if this can/should be switched to OPT_CMDMODE() so that we do not have to write this if statement in the first place.
quoted hunk
Signed-off-by: Denton Liu <redacted> --- builtin/branch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)diff --git a/builtin/branch.c b/builtin/branch.c index accb61b1aa..99633ad004 100644 --- a/builtin/branch.c +++ b/builtin/branch.c@@ -693,7 +693,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix) list = 1; if (!!delete + !!rename + !!copy + !!new_upstream + !!show_current + - list + unset_upstream > 1) + list + edit_description + unset_upstream > 1) usage_with_options(builtin_branch_usage, options); if (filter.abbrev == -1)