diff options
| author |  Michael J Gruber <git@drmicha.warpmail.net> | 2011-09-08 14:09:50 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-09-08 14:11:35 -0700 |
| commit | 7b787599e4f45784c36e82030d0f6bae72817bfc (patch) | |
| tree | 275356755ae46606cc27b306d7203dbd2dfbb56c /builtin | |
| parent | branch: allow pattern arguments (diff) | |
| download | tgif-7b787599e4f45784c36e82030d0f6bae72817bfc.tar.xz | |
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')
| -rw-r--r-- | builtin/branch.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/builtin/branch.c b/builtin/branch.c index 98a420f11a..099c75c228 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) |