@matheusbsbs / matheus-bagliano / commits / 7dd45e15c2
Fork 0

sha1_name.c: understand "describe" output as a valid object name

Signed-off-by: Junio C Hamano <junkio@cox.net>

Junio C Hamano committed Sep 20, 2006 at 16:11 UTC 7dd45e15c259e44b1c8b5ffdfc0c3d002c7f642c
1 file changed +26
sha1_name.c
+26
@@ -431,6 +431,26 @@ static int peel_onion(const char *name, int len, unsigned char *sha1)
431 return 0;
432 }
433
434 +static int get_describe_name(const char *name, int len, unsigned char *sha1)
435 +{
436 + const char *cp;
437 +
438 + for (cp = name + len - 1; name + 2 <= cp; cp--) {
439 + char ch = *cp;
440 + if (hexval(ch) & ~0377) {
441 + /* We must be looking at g in "SOMETHING-g"
442 + * for it to be describe output.
443 + */
444 + if (ch == 'g' && cp[-1] == '-') {
445 + cp++;
446 + len -= cp - name;
447 + return get_short_sha1(cp, len, sha1, 1);
448 + }
449 + }
450 + }
451 + return -1;
452 +}
453 +
454 static int get_sha1_1(const char *name, int len, unsigned char *sha1)
455 {
456 int ret, has_suffix;
@@ -472,6 +492,12 @@ static int get_sha1_1(const char *name, int len, unsigned char *sha1)
492 ret = get_sha1_basic(name, len, sha1);
493 if (!ret)
494 return 0;
495 +
496 + /* It could be describe output that is "SOMETHING-gXXXX" */
497 + ret = get_describe_name(name, len, sha1);
498 + if (!ret)
499 + return 0;
500 +
501 return get_short_sha1(name, len, sha1, 0);
502 }
503