describe: allow more than one revs to be named.

The main loop was prepared to take more than one revs, but the actual
naming logic wad not (it used pop_most_recent_commit while forgetting
that the commit marks stay after it's done).

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

diff --git a/commit.c b/commit.c
index edd4dedcdd13c2c3fd02714ef282b173f7cec7fe..e9a29caa27fbdd94810abbc4fd9c44e06c81265c 100644 (file)
--- a/commit.c
+++ b/commit.c
@@ -352,6 +352,19 @@ struct commit *pop_most_recent_commit(struct commit_list **list,
        return ret;
 }
 
        return ret;
 }
 

+void clear_commit_marks(struct commit *commit, unsigned int mark)
+{
+       struct commit_list *parents;
+
+       parents = commit->parents;
+       commit->object.flags &= ~mark;
+       while (parents) {
+               if (parents->item && parents->item->object.parsed)
+                       clear_commit_marks(parents->item, mark);
+               parents = parents->next;
+       }
+}
+

 /*
  * Generic support for pretty-printing the header
  */
 /*
  * Generic support for pretty-printing the header
  */

diff --git a/commit.h b/commit.h
index 6738a696d7d7861188873cf7f7279bc8c19545d5..9c4a244bd90cd96a461a6d6774106b0e6a11fe1e 100644 (file)
--- a/commit.h
+++ b/commit.h
@@ -58,6 +58,8 @@ struct commit *pop_most_recent_commit(struct commit_list **list,
 
 struct commit *pop_commit(struct commit_list **stack);
 
 
 struct commit *pop_commit(struct commit_list **stack);
 

+void clear_commit_marks(struct commit *commit, unsigned int mark);
+

 int count_parents(struct commit * commit);
 
 /*
 int count_parents(struct commit * commit);
 
 /*

diff --git a/describe.c b/describe.c
index 84d96b5b82bf5d1b688da39208077df5ca6ef6d9..00fa02adccda98998fcaa8feb733a71dedfee55f 100644 (file)
--- a/describe.c
+++ b/describe.c
@@ -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));
                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)
 }
 
 int main(int argc, char **argv)