From: Shawn O. Pearce Date: Thu, 25 Jan 2007 17:39:54 +0000 (-0500) Subject: Teach git-describe to display distances from tags. X-Git-Tag: v1.5.0-rc3~36 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=237fb6ca7cbe45f88523ad367d0d703a039dff2d;p=git.git Teach git-describe to display distances from tags. If you get two different describes at different times from a non-rewinding branch and they both come up with the same tag name, you can tell which is the 'newer' one by distance. This is rather common in practice, so its incredibly useful. [jc: still needs documentation and fixups when traversal gives up early.] Signed-off-by: Shawn O. Pearce Signed-off-by: Junio C Hamano --- diff --git a/builtin-describe.c b/builtin-describe.c index f3ac2d5f8..aedbc78da 100644 --- a/builtin-describe.c +++ b/builtin-describe.c @@ -191,8 +191,9 @@ static void describe(const char *arg, int last_one) if (abbrev == 0) printf("%s\n", all_matches[0].name->path ); else - printf("%s-g%s\n", all_matches[0].name->path, - find_unique_abbrev(cmit->object.sha1, abbrev)); + printf("%s-%d-g%s\n", all_matches[0].name->path, + all_matches[0].depth, + find_unique_abbrev(cmit->object.sha1, abbrev)); if (!last_one) clear_commit_marks(cmit, -1);