mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

branch: don't mix --edit-description

Browse Source 
`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>
This commit is contained in:
Denton Liu 2020-06-15 07:53:20 -04:00 committed by Junio C Hamano
parent 6b7093064a
commit dc44639904
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/branch.c
View File

@ -695,7 +695,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
list = 1; list = 1;
if (!!delete + !!rename + !!copy + !!new_upstream + !!show_current + 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); usage_with_options(builtin_branch_usage, options);
if (filter.abbrev == -1) if (filter.abbrev == -1)