Teach git-describe to display distances from tags.

diff --git a/builtin-describe.c b/builtin-describe.c
index f3ac2d5f89d88790c4336be279ddbfb7ea203d6f..aedbc78dac9639cbb9ff37edc50102cc8550c7a0 100644 (file)
--- 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);