Browse Source

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>
maint
Denton Liu 5 years ago committed by Junio C Hamano
parent
commit
dc44639904
  1. 2
      builtin/branch.c

2
builtin/branch.c

@ -695,7 +695,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix) @@ -695,7 +695,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)

Loading…
Cancel
Save