diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-10-05 12:36:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-05 12:36:23 -0700 |
| commit | 1077bf1ff676cd172a09b88204422228f21d7cbf (patch) | |
| tree | 09198a4933da76f03c78ab6c088999a1e2fe0ce1 /t/t6040-tracking-info.sh | |
| parent | 3c18ee72cc2f3d0024b7314cdb1af5d41aea136a (diff) | |
| parent | 376eb14a05f693378047eee36a10035c122f0261 (diff) | |
| download | git-1077bf1ff676cd172a09b88204422228f21d7cbf.tar.gz | |
Merge branch 'mg/branch-list'
* mg/branch-list:
t3200: clean up checks for file existence
branch: -v does not automatically imply --list
branch: allow pattern arguments
branch: introduce --list option
git-branch: introduce missing long forms for the options
git-tag: introduce long forms for the options
t6040: test branch -vv
Conflicts:
Documentation/git-tag.txt
t/t3200-branch.sh
Diffstat (limited to 't/t6040-tracking-info.sh')
| -rwxr-xr-x | t/t6040-tracking-info.sh | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/t/t6040-tracking-info.sh b/t/t6040-tracking-info.sh index 19de5b16eb..19272bc551 100755 --- 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 |