[PATCH 9/9] sha1_name.c: get_describe_name() by definition groks only commits

From

Junio C Hamano <gitster@pobox.com>

Date

Jun 18, 2012, 22:05 UTC

Message-ID

<1340057139-8311-11-git-send-email-gitster@pobox.com>

In-Reply-To

<1340057139-8311-1-git-send-email-gitster@pobox.com>

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 sha1_name.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sha1_name.c b/sha1_name.c
index 4a0fefd..b09a23e 100644
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -569,6 +569,7 @@ static int peel_onion(const char *name, int len, unsigned char *sha1)
 static int get_describe_name(const char *name, int len, unsigned char *sha1)
 {
 	const char *cp;
+	unsigned flags = GET_SHORT_QUIETLY | GET_SHORT_COMMIT_ONLY;
 
 	for (cp = name + len - 1; name + 2 <= cp; cp--) {
 		char ch = *cp;
@@ -579,7 +580,7 @@ static int get_describe_name(const char *name, int len, unsigned char *sha1)
 			if (ch == 'g' && cp[-1] == '-') {
 				cp++;
 				len -= cp - name;
-				return get_short_sha1(cp, len, sha1, GET_SHORT_QUIETLY);
+				return get_short_sha1(cp, len, sha1, flags);
 			}
 		}
 	}

-- 
1.7.11