git-prompt: add a describe style for any tags

git-prompt has various describe styles, among them "describe" (by
annotated tags) and "default" (by exact match with any tag).

Add a mode "tag" that describes by any tag, annotated or not.

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh
index 97eacd7832b28377c5e14918ce6bededc55d7d40..c6cbef38c2a580555dfcdc67e04f6ac507f9066c 100644 (file)
--- a/contrib/completion/git-prompt.sh
+++ b/contrib/completion/git-prompt.sh
@@ -82,6 +82,7 @@
 #     contains      relative to newer annotated tag (v1.6.3.2~35)
 #     branch        relative to newer tag or branch (master~4)
 #     describe      relative to older annotated tag (v1.6.3.1-13-gdd42c2f)
 #     contains      relative to newer annotated tag (v1.6.3.2~35)
 #     branch        relative to newer tag or branch (master~4)
 #     describe      relative to older annotated tag (v1.6.3.1-13-gdd42c2f)

+#     tag           relative to any older tag (v1.6.3.1-13-gdd42c2f)

 #     default       exactly matching tag
 #
 # If you would like a colored hint about the current dirty state, set
 #     default       exactly matching tag
 #
 # If you would like a colored hint about the current dirty state, set


@@ -443,6 +444,8 @@ __git_ps1 ()
                                        git describe --contains HEAD ;;
                                (branch)
                                        git describe --contains --all HEAD ;;
                                        git describe --contains HEAD ;;
                                (branch)
                                        git describe --contains --all HEAD ;;

+                               (tag)
+                                       git describe --tags HEAD ;;

                                (describe)
                                        git describe HEAD ;;
                                (* | default)
                                (describe)
                                        git describe HEAD ;;
                                (* | default)