summaryrefslogtreecommitdiff
path: root/t/t3203-branch-output.sh
diff options
context:
space:
mode:
authorMichael J Gruber <git@drmicha.warpmail.net>2011-09-08 14:09:50 -0700
committerJunio C Hamano <gitster@pobox.com>2011-09-08 14:11:35 -0700
commit7b787599e4f45784c36e82030d0f6bae72817bfc (patch)
tree275356755ae46606cc27b306d7203dbd2dfbb56c /t/t3203-branch-output.sh
parentd8d33736b53fb0bef68ca30a64bf7f9ecd872115 (diff)
downloadgit-7b787599e4f45784c36e82030d0f6bae72817bfc.tar.gz
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 't/t3203-branch-output.sh')
-rwxr-xr-xt/t3203-branch-output.sh8
1 files changed, 6 insertions, 2 deletions
diff --git a/t/t3203-branch-output.sh b/t/t3203-branch-output.sh
index f2b294b144..76fe7e0060 100755
--- a/t/t3203-branch-output.sh
+++ b/t/t3203-branch-output.sh
@@ -84,12 +84,16 @@ cat >expect <<'EOF'
two
one
EOF
-test_expect_success 'git branch -v pattern shows branch summaries' '
- git branch -v branch* >tmp &&
+test_expect_success 'git branch --list -v pattern shows branch summaries' '
+ git branch --list -v branch* >tmp &&
awk "{print \$NF}" <tmp >actual &&
test_cmp expect actual
'
+test_expect_success 'git branch -v pattern does not show branch summaries' '
+ test_must_fail git branch -v branch*
+'
+
cat >expect <<'EOF'
* (no branch)
branch-one