branch: don't mix --edit-description
`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. Signed-off-by: Denton Liu <liu.denton@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Denton Liu committed
Jun 15, 2020 at 07:53 UTC
dc44639904c9a0899854c79c97c248f3d3cc2bdc
1 file changed
+1
-1
builtin/branch.c
+1
-1
@@ -695,7 +695,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
695
list = 1;
696
697
if (!!delete + !!rename + !!copy + !!new_upstream + !!show_current +
698
- list + unset_upstream > 1)
698
+ list + edit_description + unset_upstream > 1)
699
usage_with_options(builtin_branch_usage, options);
700
701
if (filter.abbrev == -1)