[PATCH] Unify usage strings declaration

[git.git] / rev-list.c

diff --git a/rev-list.c b/rev-list.c
index 46a35d3..846aa2f 100644 (file)
--- a/rev-list.c
+++ b/rev-list.c
@@ -11,7 +11,7 @@
 #define SHOWN          (1u << 3)
 
 static const char rev_list_usage[] =
-       "usage: git-rev-list [OPTION] commit-id <commit-id>\n"
+       "git-rev-list [OPTION] commit-id <commit-id>\n"
                      "  --max-count=nr\n"
                      "  --max-age=epoch\n"
                      "  --min-age=epoch\n"
@@ -228,6 +228,17 @@ static void mark_parents_uninteresting(struct commit *commit)
                commit->object.flags |= UNINTERESTING;
 
                /*
+                * Normally we haven't parsed the parent
+                * yet, so we won't have a parent of a parent
+                * here. However, it may turn out that we've
+                * reached this commit some other way (where it
+                * wasn't uninteresting), in which case we need
+                * to mark its parents recursively too..
+                */
+               if (commit->parents)
+                       mark_parents_uninteresting(commit);
+
+               /*
                 * A missing commit is ok iff its parent is marked 
                 * uninteresting.
                 *