diff options
author | Junio C Hamano <gitster@pobox.com> | 2008-10-19 16:06:39 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-10-19 16:06:39 -0700 |
commit | 18e143487ddb5b32b2f6003972d2115bb4ac460f (patch) | |
tree | 91900030326713c669a00f2bcadc6aaec948efda /t | |
parent | Merge branch 'ae/preservemerge' (diff) | |
parent | describe: Make --tags and --all match lightweight tags more often (diff) | |
download | tgif-18e143487ddb5b32b2f6003972d2115bb4ac460f.tar.xz |
Merge branch 'sp/describe-lwtag'
* sp/describe-lwtag:
describe: Make --tags and --all match lightweight tags more often
Diffstat (limited to 't')
-rwxr-xr-x | t/t6120-describe.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/t/t6120-describe.sh b/t/t6120-describe.sh index 16cc635813..e6c9e59b61 100755 --- a/t/t6120-describe.sh +++ b/t/t6120-describe.sh @@ -91,10 +91,10 @@ check_describe D-* HEAD^^ check_describe A-* HEAD^^2 check_describe B HEAD^^2^ -check_describe A-* --tags HEAD -check_describe A-* --tags HEAD^ -check_describe D-* --tags HEAD^^ -check_describe A-* --tags HEAD^^2 +check_describe c-* --tags HEAD +check_describe c-* --tags HEAD^ +check_describe e-* --tags HEAD^^ +check_describe c-* --tags HEAD^^2 check_describe B --tags HEAD^^2^ check_describe B-0-* --long HEAD^^2^ |