merge-recursive: Improve the error message printed when merge(1) isn't found.

[git.git] / describe.c

diff --git a/describe.c b/describe.c
index 84d96b5..cc95eb0 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)
@@ -98,7 +98,7 @@ static int compare_names(const void *_a, const void *_b)
        return (a_date > b_date) ? -1 : (a_date == b_date) ? 0 : 1;
 }
 
-static void describe(struct commit *cmit)
+static void describe(struct commit *cmit, int last_one)
 {
        struct commit_list *list;
        static int initialized = 0;
@@ -124,9 +124,12 @@ static void describe(struct commit *cmit)
                if (n) {
                        printf("%s-g%s\n", n->path,
                               find_unique_abbrev(cmit->object.sha1, abbrev));
+                       if (!last_one)
+                               clear_commit_marks(cmit, SEEN);
                        return;
                }
        }
+       die("cannot describe '%s'", sha1_to_hex(cmit->object.sha1));
 }
 
 int main(int argc, char **argv)
@@ -157,7 +160,7 @@ int main(int argc, char **argv)
                cmit = lookup_commit_reference(sha1);
                if (!cmit)
                        usage(describe_usage);
-               describe(cmit);
+               describe(cmit, i == argc - 1);
        }
        return 0;
 }