diff --git a/rev-list.c b/rev-list.c
index c4a61513438b707c097815b7e0acbcea400f6d79..fdb531caf6db4944f0612258697670eb00bc55ce 100644 (file)
--- a/rev-list.c
+++ b/rev-list.c
#define INTERESTING (1u << 1)
#define COUNTED (1u << 2)
#define SHOWN (1u << 3)
#define INTERESTING (1u << 1)
#define COUNTED (1u << 2)
#define SHOWN (1u << 3)
-#define DUPCHECK (1u << 4)
static const char rev_list_usage[] =
"usage: git-rev-list [OPTION] commit-id <commit-id>\n"
static const char rev_list_usage[] =
"usage: git-rev-list [OPTION] commit-id <commit-id>\n"
if (obj->flags & UNINTERESTING)
return;
obj->flags |= UNINTERESTING;
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;
if (parse_tree(tree) < 0)
die("bad tree %s", sha1_to_hex(obj->sha1));
entry = tree->entries;
while (parents) {
struct commit *commit = parents->item;
commit->object.flags |= UNINTERESTING;
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;
}
}
parents = parents->next;
}
}
@@ -355,12 +367,12 @@ static struct commit *get_commit_reference(const char *name, unsigned int flags)
/*
* Tag object? Look what it points to..
*/
/*
* 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);
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);
}
/*
}
/*
@@ -372,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);
object->flags |= flags;
if (parse_commit(commit) < 0)
die("unable to parse commit %s", name);
+ if (flags & UNINTERESTING)
+ mark_parents_uninteresting(commit);
return commit;
}
return commit;
}
@@ -411,10 +425,8 @@ static struct commit *get_commit_reference(const char *name, unsigned int flags)
int main(int argc, char **argv)
{
struct commit_list *list = NULL;
int main(int argc, char **argv)
{
struct commit_list *list = NULL;
- struct commit_list *(*insert)(struct commit *, struct commit_list **);
int i, limited = 0;
int i, limited = 0;
- insert = insert_by_date;
for (i = 1 ; i < argc; i++) {
int flags;
char *arg = argv[i];
for (i = 1 ; i < argc; i++) {
int flags;
char *arg = argv[i];
}
if (!strcmp(arg, "--merge-order")) {
merge_order = 1;
}
if (!strcmp(arg, "--merge-order")) {
merge_order = 1;
- insert = commit_list_insert;
continue;
}
if (!strcmp(arg, "--show-breaks")) {
continue;
}
if (!strcmp(arg, "--show-breaks")) {
}
if (!strcmp(arg, "--topo-order")) {
topo_order = 1;
}
if (!strcmp(arg, "--topo-order")) {
topo_order = 1;
+ limited = 1;
continue;
}
continue;
}
commit = get_commit_reference(arg, flags);
if (!commit)
continue;
commit = get_commit_reference(arg, flags);
if (!commit)
continue;
- if (commit->object.flags & DUPCHECK)
+ if (commit->object.flags & SEEN)
continue;
continue;
- commit->object.flags |= DUPCHECK;
- insert(commit, &list);
+ commit->object.flags |= SEEN;
+ commit_list_insert(commit, &list);
}
if (!merge_order) {
}
if (!merge_order) {
+ sort_by_date(&list);
if (limited)
list = limit_list(list);
if (topo_order)
if (limited)
list = limit_list(list);
if (topo_order)