From e00dd1e9485c50f202cc97dfae19d510e108b565 Mon Sep 17 00:00:00 2001 From: Mike Crowe Date: Fri, 17 May 2013 21:56:18 +0100 Subject: describe: Add --first-parent option Only consider the first parent commit when walking the commit history. This is useful if you only wish to match tags on your branch after a merge. Signed-off-by: Mike Crowe Signed-off-by: Junio C Hamano --- t/t6120-describe.sh | 3 +++ 1 file changed, 3 insertions(+) (limited to 't') diff --git a/t/t6120-describe.sh b/t/t6120-describe.sh index f67aa6ff6a..a25729f2a7 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' ' -- cgit v1.2.3