From: Denton Liu Date: Mon, 15 Jun 2020 11:53:20 +0000 (-0400) Subject: branch: don't mix --edit-description X-Git-Tag: v2.28.0-rc0~40^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dc44639904c9a0899854c79c97c248f3d3cc2bdc;p=thirdparty%2Fgit.git 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 Signed-off-by: Junio C Hamano --- diff --git a/builtin/branch.c b/builtin/branch.c index d8297f80ff..1263eb2797 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -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)