Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
t6040: test branch -vv
author
Michael J Gruber
<git@drmicha.warpmail.net>
Fri, 26 Aug 2011 14:05:11 +0000
(16:05 +0200)
committer
Junio C Hamano
<gitster@pobox.com>
Fri, 26 Aug 2011 17:45:04 +0000
(10:45 -0700)
t6040 has a test for 'git branch -v' but not for 'git branch -vv'.
Add one.
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t6040-tracking-info.sh
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(from parent 1:
b792c06
)
diff --git
a/t/t6040-tracking-info.sh
b/t/t6040-tracking-info.sh
index a9b0ac1efc0eac3f50bd9fe26e5900307eddaba2..4e57dc8cdc423e6c478371d94a304f5bd82e1f41 100755
(executable)
--- a/
t/t6040-tracking-info.sh
+++ b/
t/t6040-tracking-info.sh
@@
-51,6
+51,22
@@
test_expect_success 'branch -v' '
test_i18ncmp expect actual
'
+cat >expect <<\EOF
+b1 origin/master: ahead 1, behind 1
+b2 origin/master: ahead 1, behind 1
+b3 origin/master: behind 1
+b4 origin/master: ahead 2
+EOF
+
+test_expect_success 'branch -vv' '
+ (
+ cd test &&
+ git branch -vv
+ ) |
+ sed -n -e "$script" >actual &&
+ test_i18ncmp expect actual
+'
+
test_expect_success 'checkout' '
(
cd test && git checkout b1