Update Maintainer field of debian/control

diff --git a/rev-list.c b/rev-list.c
index 309070fedd74b5aae204694fd40ebd48827e03f2..fae30a2b68c98555bc8c2e5c9cea84c358ec8363 100644 (file)
--- a/rev-list.c
+++ b/rev-list.c
@@ -227,6 +227,17 @@ static void mark_parents_uninteresting(struct commit *commit)
                struct commit *commit = parents->item;
                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.
@@ -446,6 +457,15 @@ static struct commit *get_commit_reference(const char *name, unsigned int flags)
        die("%s is unknown object", name);
 }
 
+static void handle_one_commit(struct commit *com, struct commit_list **lst)
+{
+       if (!com || com->object.flags & SEEN)
+               return;
+       com->object.flags |= SEEN;
+       commit_list_insert(com, lst);
+}
+
+
 int main(int argc, char **argv)
 {
        struct commit_list *list = NULL;
@@ -454,6 +474,7 @@ int main(int argc, char **argv)
        for (i = 1 ; i < argc; i++) {
                int flags;
                char *arg = argv[i];
+               char *dotdot;
                struct commit *commit;
 
                if (!strncmp(arg, "--max-count=", 12)) {
@@ -512,21 +533,33 @@ int main(int argc, char **argv)
                        continue;
                }
 
+               if (show_breaks && !merge_order)
+                       usage(rev_list_usage);
+
                flags = 0;
+               dotdot = strstr(arg, "..");
+               if (dotdot) {
+                       char *next = dotdot + 2;
+                       struct commit *exclude = NULL;
+                       struct commit *include = NULL;
+                       *dotdot = 0;
+                       exclude = get_commit_reference(arg, UNINTERESTING);
+                       include = get_commit_reference(next, 0);
+                       if (exclude && include) {
+                               limited = 1;
+                               handle_one_commit(exclude, &list);
+                               handle_one_commit(include, &list);
+                               continue;
+                       }
+                       *next = '.';
+               }
                if (*arg == '^') {
                        flags = UNINTERESTING;
                        arg++;
                        limited = 1;
                }
-               if (show_breaks && !merge_order)
-                       usage(rev_list_usage);
                commit = get_commit_reference(arg, flags);
-               if (!commit)
-                       continue;
-               if (commit->object.flags & SEEN)
-                       continue;
-               commit->object.flags |= SEEN;
-               commit_list_insert(commit, &list);
+               handle_one_commit(commit, &list);
        }
 
        if (!merge_order) {             
@@ -537,9 +570,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;