X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=rev-list.c;h=fdb531caf6db4944f0612258697670eb00bc55ce;hb=49ce3d0c4e732bbabb7a2bda1d89d80eeb76d5b6;hp=0d3c7741a59254f62a135a3bd749e38e1b8dfe71;hpb=12ba7eaf1d8188ff85439abb98c5ce64cc81b319;p=git.git

diff --git a/rev-list.c b/rev-list.c
index 0d3c7741..fdb531ca 100644
--- a/rev-list.c
+++ b/rev-list.c
@@ -8,7 +8,7 @@
 #define SEEN		(1u << 0)
 #define INTERESTING	(1u << 1)
 #define COUNTED		(1u << 2)
-#define SHOWN		(LAST_EPOCH_FLAG << 2)
+#define SHOWN		(1u << 3)
 
 static const char rev_list_usage[] =
 	"usage: git-rev-list [OPTION] commit-id <commit-id>\n"
@@ -38,6 +38,7 @@ static enum cmit_fmt commit_format = CMIT_FMT_RAW;
 static int merge_order = 0;
 static int show_breaks = 0;
 static int stop_traversal = 0;
+static int topo_order = 0;
 
 static void show_commit(struct commit *commit)
 {
@@ -69,19 +70,15 @@ static void show_commit(struct commit *commit)
 
 static int filter_commit(struct commit * commit)
 {
-	if (merge_order && stop_traversal && commit->object.flags & BOUNDARY)
+	if (stop_traversal && (commit->object.flags & BOUNDARY))
 		return STOP;
 	if (commit->object.flags & (UNINTERESTING|SHOWN))
 		return CONTINUE;
 	if (min_age != -1 && (commit->date > min_age))
 		return CONTINUE;
 	if (max_age != -1 && (commit->date < max_age)) {
-		if (!merge_order)
-			return STOP;
-		else {
-			stop_traversal = 1;
-			return CONTINUE;
-		}
+		stop_traversal=1;
+		return merge_order?CONTINUE:STOP;
 	}
 	if (max_count != -1 && !max_count--)
 		return STOP;
@@ -206,6 +203,8 @@ static void mark_tree_uninteresting(struct tree *tree)
 	if (obj->flags & UNINTERESTING)
 		return;
 	obj->flags |= UNINTERESTING;
+	if (!has_sha1_file(obj->sha1))
+		return;
 	if (parse_tree(tree) < 0)
 		die("bad tree %s", sha1_to_hex(obj->sha1));
 	entry = tree->entries;
@@ -227,6 +226,17 @@ static void mark_parents_uninteresting(struct commit *commit)
 	while (parents) {
 		struct commit *commit = parents->item;
 		commit->object.flags |= UNINTERESTING;
+
+		/*
+		 * A missing commit is ok iff its parent is marked 
+		 * uninteresting.
+		 *
+		 * We just mark such a thing parsed, so that when
+		 * it is popped next time around, we won't be trying
+		 * to parse it and get an error.
+		 */
+		if (!has_sha1_file(commit->object.sha1))
+			commit->object.parsed = 1;
 		parents = parents->next;
 	}
 }
@@ -357,12 +367,12 @@ static struct commit *get_commit_reference(const char *name, unsigned int flags)
 	/*
 	 * Tag object? Look what it points to..
 	 */
-	if (object->type == tag_type) {
+	while (object->type == tag_type) {
 		struct tag *tag = (struct tag *) object;
 		object->flags |= flags;
 		if (tag_objects && !(object->flags & UNINTERESTING))
 			add_pending_object(object, tag->tag);
-		object = tag->tagged;
+		object = parse_object(tag->tagged->sha1);
 	}
 
 	/*
@@ -374,6 +384,8 @@ static struct commit *get_commit_reference(const char *name, unsigned int flags)
 		object->flags |= flags;
 		if (parse_commit(commit) < 0)
 			die("unable to parse commit %s", name);
+		if (flags & UNINTERESTING)
+			mark_parents_uninteresting(commit);
 		return commit;
 	}
 
@@ -470,6 +482,11 @@ int main(int argc, char **argv)
 			show_breaks = 1;
 			continue;
 		}
+		if (!strcmp(arg, "--topo-order")) {
+		        topo_order = 1;
+		        limited = 1;
+			continue;
+		}
 
 		flags = 0;
 		if (*arg == '^') {
@@ -482,12 +499,18 @@ int main(int argc, char **argv)
 		commit = get_commit_reference(arg, flags);
 		if (!commit)
 			continue;
-		insert_by_date(&list, commit);
+		if (commit->object.flags & SEEN)
+			continue;
+		commit->object.flags |= SEEN;
+		commit_list_insert(commit, &list);
 	}
 
 	if (!merge_order) {		
+		sort_by_date(&list);
 	        if (limited)
 			list = limit_list(list);
+		if (topo_order)
+			sort_in_topological_order(&list);
 		show_commit_list(list);
 	} else {
 		if (sort_list_in_merge_order(list, &process_commit)) {