summaryrefslogtreecommitdiff
path: root/builtin/branch.c
diff options
context:
space:
mode:
authorMichael J Gruber <git@drmicha.warpmail.net>2011-09-08 21:09:50 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-09-08 21:11:35 (GMT)
commit7b787599e4f45784c36e82030d0f6bae72817bfc (patch)
tree275356755ae46606cc27b306d7203dbd2dfbb56c /builtin/branch.c
parentd8d33736b53fb0bef68ca30a64bf7f9ecd872115 (diff)
downloadgit-7b787599e4f45784c36e82030d0f6bae72817bfc.zip
git-7b787599e4f45784c36e82030d0f6bae72817bfc.tar.gz
git-7b787599e4f45784c36e82030d0f6bae72817bfc.tar.bz2
branch: -v does not automatically imply --list
"branch -v" without other options or parameters still works in the list mode, but that is not because there is "-v" but because there is no parameter nor option. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.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, 1 insertions, 2 deletions
diff --git a/builtin/branch.c b/builtin/branch.c
index 98a420f..099c75c 100644
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -712,8 +712,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
argc = parse_options(argc, argv, prefix, options, builtin_branch_usage,
0);
- if (!delete && !rename && !force_create &&
- (argc == 0 || (verbose && argc)))
+ if (!delete && !rename && !force_create && argc == 0)
list = 1;
if (!!delete + !!rename + !!force_create + !!list > 1)