diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-06-16 16:21:15 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-16 16:21:15 -0700 |
| commit | f62e53c897c359b5885c474c41341d83845a78f6 (patch) | |
| tree | 3dd9a2f5302fd65f516c6678d1b8659fa4b4c921 /t | |
| parent | 5c1eba5e312838774afe44bb52885f3cd7e4ac7a (diff) | |
| parent | 03e8b541b38d95d1cd7b287963c82617a0469f80 (diff) | |
| download | git-f62e53c897c359b5885c474c41341d83845a78f6.tar.gz git-f62e53c897c359b5885c474c41341d83845a78f6.tar.xz | |
Merge branch 'sp/maint-describe-tiebreak-with-tagger-date' into maint
* sp/maint-describe-tiebreak-with-tagger-date:
describe: Break annotated tag ties by tagger date
tag.c: Parse tagger date (if present)
tag.c: Refactor parse_tag_buffer to be saner to program
tag.h: Remove unused signature field
tag.c: Correct indentation
Diffstat (limited to 't')
| -rwxr-xr-x | t/t6120-describe.sh | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/t/t6120-describe.sh b/t/t6120-describe.sh index 065deadc2..876d1ab74 100755 --- a/t/t6120-describe.sh +++ b/t/t6120-describe.sh @@ -8,7 +8,7 @@ test_description='test describe o----o----o----o----o----. / \ A c / .------------o---o---o - D e + D,R e ' . ./test-lib.sh @@ -68,6 +68,8 @@ test_expect_success setup ' echo D >another && git add another && git commit -m D && test_tick && git tag -a -m D D && + test_tick && + git tag -a -m R R && test_tick && echo DD >another && git commit -a -m another && @@ -89,10 +91,10 @@ test_expect_success setup ' check_describe A-* HEAD check_describe A-* HEAD^ -check_describe D-* HEAD^^ +check_describe R-* HEAD^^ check_describe A-* HEAD^^2 check_describe B HEAD^^2^ -check_describe D-* HEAD^^^ +check_describe R-* HEAD^^^ check_describe c-* --tags HEAD check_describe c-* --tags HEAD^ |