summaryrefslogtreecommitdiff
path: root/t/t6120-describe.sh
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2008-10-13 07:39:46 -0700
committerJunio C Hamano <gitster@pobox.com>2008-10-17 11:35:43 -0700
commit7e425c4fbbe9affffa822f154d8bb2d0da6699ef (patch)
tree1dc1da95ff2740e01d0dc69ef471f6855ae866fa /t/t6120-describe.sh
parent5c283eb13c94be6ca974aa722159dc9838d10d97 (diff)
downloadgit-7e425c4fbbe9affffa822f154d8bb2d0da6699ef.tar.gz
describe: Make --tags and --all match lightweight tags more often
If the caller supplies --tags they want the lightweight, unannotated tags to be searched for a match. If a lightweight tag is closer in the history, it should be matched, even if an annotated tag is reachable further back in the commit chain. The same applies with --all when matching any other type of ref. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Acked-By: Uwe Kleine-König <ukleinek@strlen.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6120-describe.sh')
-rwxr-xr-xt/t6120-describe.sh8
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^