GIT 1.1.0

[git.git] / describe.c

diff --git a/describe.c b/describe.c
index 84d96b5..a0180f5 100644 (file)
--- a/describe.c
+++ b/describe.c
@@ -18,7 +18,7 @@ static int names = 0, allocs = 0;
 static struct commit_name {
        const struct commit *commit;
        int prio; /* annotated tag = 2, tag = 1, head = 0 */
-       char path[];
+       char path[FLEX_ARRAY]; /* more */
 } **name_array = NULL;
 
 static struct commit_name *match(struct commit *cmit)
@@ -124,9 +124,10 @@ static void describe(struct commit *cmit)
                if (n) {
                        printf("%s-g%s\n", n->path,
                               find_unique_abbrev(cmit->object.sha1, abbrev));
-                       return;
+                       break;
                }
        }
+       clear_commit_marks(cmit, SEEN);
 }
 
 int main(int argc, char **argv)