branch: let branch filters imply --list

diff --git a/builtin/branch.c b/builtin/branch.c
index 597b578e1808feb3b0d4e214ea908078918ee301..bd2c36b706955e6b50daaec82f60d13f9c9a9a86 100644 (file)
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -825,6 +825,9 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
        if (!delete && !rename && !edit_description && !new_upstream && !unset_upstream && argc == 0)
                list = 1;
 
+       if (with_commit || merge_filter != NO_FILTER)
+               list = 1;
+
        if (!!delete + !!rename + !!force_create + !!list + !!new_upstream + !!unset_upstream > 1)
                usage_with_options(builtin_branch_usage, options);