Merge branch 'bc/sha-256-part-2'

[thirdparty/git.git] / builtin / branch.c

diff --git a/builtin/branch.c b/builtin/branch.c
index accb61b1aae3837a0771839c7b167c85243808f8..99633ad004dca39cdfee5dce3ff3a668c7e75ad9 100644 (file)
--- 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)