diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-06-02 22:59:49 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-02 22:59:49 (GMT) |
| commit | 4de1179afcb1105a43cf167b513afda42c4f152d (patch) | |
| tree | 97303fdf5a83bdefec918e2fd6aa7779133729e7 /t | |
| parent | 103093a0a80c385d17571a9c6da7b6c03227c767 (diff) | |
| parent | e00dd1e9485c50f202cc97dfae19d510e108b565 (diff) | |
| download | git-4de1179afcb1105a43cf167b513afda42c4f152d.zip git-4de1179afcb1105a43cf167b513afda42c4f152d.tar.gz git-4de1179afcb1105a43cf167b513afda42c4f152d.tar.bz2 | |
Merge branch 'mc/describe-first-parent'
* mc/describe-first-parent:
describe: Add --first-parent option
Diffstat (limited to 't')
| -rwxr-xr-x | t/t6120-describe.sh | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/t/t6120-describe.sh b/t/t6120-describe.sh index f67aa6f..a25729f 100755 --- a/t/t6120-describe.sh +++ b/t/t6120-describe.sh @@ -110,6 +110,9 @@ check_describe tags/e --all HEAD^^^ check_describe B-0-* --long HEAD^^2^ check_describe A-3-* --long HEAD^^2 +check_describe c-7-* --tags +check_describe e-3-* --first-parent --tags + : >err.expect check_describe A --all A^0 test_expect_success 'no warning was displayed for A' ' |