summaryrefslogtreecommitdiff
path: root/builtin/branch.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2013-01-31 06:46:11 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-02-01 00:37:24 (GMT)
commitd040350813986e0f4bb3aeb977077975c1552606 (patch)
treeb678d552c4808396e346d9dae42503499940b906 /builtin/branch.c
parentde90ff81f3bba50776b934842112eeb6e69a0d23 (diff)
downloadgit-d040350813986e0f4bb3aeb977077975c1552606.zip
git-d040350813986e0f4bb3aeb977077975c1552606.tar.gz
git-d040350813986e0f4bb3aeb977077975c1552606.tar.bz2
branch: let branch filters imply --list
Currently, a branch filter like `--contains`, `--merged`, or `--no-merged` is ignored when we are not in listing mode. For example: git branch --contains=foo bar will create the branch "bar" from the current HEAD, ignoring the `--contains` argument entirely. This is not very helpful. There are two reasonable behaviors for git here: 1. Flag an error; the arguments do not make sense. 2. Implicitly go into `--list` mode This patch chooses the latter, as it is more convenient, and there should not be any ambiguity with attempting to create a branch; using `--contains` and not wanting to list is nonsensical. That leaves the case where an explicit modification option like `-d` is given. We already catch the case where `--list` is given alongside `-d` and flag an error. With this patch, we will also catch the use of `--contains` and other filter options alongside `-d`. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/branch.c')
-rw-r--r--builtin/branch.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/builtin/branch.c b/builtin/branch.c
index 597b578..bd2c36b 100644
--- 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);