diff --git a/rev-list.c b/rev-list.c
index e41d5a045c3192f4759aa5b2e4881f28f92ed68f..523fda07e1eef4b3a1a801abbf94358d06af17fd 100644 (file)
--- a/rev-list.c
+++ b/rev-list.c
return CONTINUE;
if (max_age != -1 && (commit->date < max_age)) {
stop_traversal=1;
return CONTINUE;
if (max_age != -1 && (commit->date < max_age)) {
stop_traversal=1;
- return merge_order?CONTINUE:STOP;
+ return CONTINUE;
}
if (max_count != -1 && !max_count--)
return STOP;
}
if (max_count != -1 && !max_count--)
return STOP;
struct commit *commit = pop_most_recent_commit(&list, SEEN);
struct object *obj = &commit->object;
struct commit *commit = pop_most_recent_commit(&list, SEEN);
struct object *obj = &commit->object;
+ if (max_age != -1 && (commit->date < max_age))
+ obj->flags |= UNINTERESTING;
if (unpacked && has_sha1_pack(obj->sha1))
obj->flags |= UNINTERESTING;
if (obj->flags & UNINTERESTING) {
if (unpacked && has_sha1_pack(obj->sha1))
obj->flags |= UNINTERESTING;
if (obj->flags & UNINTERESTING) {
break;
continue;
}
break;
continue;
}
+ if (min_age != -1 && (commit->date > min_age))
+ continue;
p = &commit_list_insert(commit, p)->next;
}
if (tree_objects)
p = &commit_list_insert(commit, p)->next;
}
if (tree_objects)
}
if (!strncmp(arg, "--max-age=", 10)) {
max_age = atoi(arg + 10);
}
if (!strncmp(arg, "--max-age=", 10)) {
max_age = atoi(arg + 10);
+ limited = 1;
continue;
}
if (!strncmp(arg, "--min-age=", 10)) {
min_age = atoi(arg + 10);
continue;
}
if (!strncmp(arg, "--min-age=", 10)) {
min_age = atoi(arg + 10);
+ limited = 1;
continue;
}
if (!strcmp(arg, "--header")) {
continue;
}
if (!strcmp(arg, "--header")) {