[PATCH] git-send-email-script: Reformat readline interface and generate a better...

[git.git] / rev-list.c

diff --git a/rev-list.c b/rev-list.c
index 309070f..83a604a 100644 (file)
--- a/rev-list.c
+++ b/rev-list.c
@@ -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.
                 *
@@ -537,9 +548,13 @@ int main(int argc, char **argv)
                        sort_in_topological_order(&list);
                show_commit_list(list);
        } else {
+#ifndef NO_OPENSSL
                if (sort_list_in_merge_order(list, &process_commit)) {
-                         die("merge order sort failed\n");
+                       die("merge order sort failed\n");
                }
+#else
+               die("merge order sort unsupported, OpenSSL not linked");
+#endif
        }
 
        return 0;