projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fixes'
[git.git]
/
rev-list.c
diff --git
a/rev-list.c
b/rev-list.c
index
91534dd
..
523fda0
100644
(file)
--- a/
rev-list.c
+++ b/
rev-list.c
@@
-86,7
+86,7
@@
static int filter_commit(struct commit * commit)
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;
@@
-374,6
+374,8
@@
static struct commit_list *limit_list(struct commit_list *list)
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) {
@@
-382,6
+384,8
@@
static struct commit_list *limit_list(struct commit_list *list)
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)
@@
-494,10
+498,12
@@
int main(int argc, char **argv)
}
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")) {
@@
-561,6
+567,8
@@
int main(int argc, char **argv)
struct commit *exclude = NULL;
struct commit *include = NULL;
*dotdot = 0;
struct commit *exclude = NULL;
struct commit *include = NULL;
*dotdot = 0;
+ if (!*next)
+ next = "HEAD";
exclude = get_commit_reference(arg, UNINTERESTING);
include = get_commit_reference(next, 0);
if (exclude && include) {
exclude = get_commit_reference(arg, UNINTERESTING);
include = get_commit_reference(next, 0);
if (exclude && include) {
@@
-569,7
+577,7
@@
int main(int argc, char **argv)
handle_one_commit(include, &list);
continue;
}
handle_one_commit(include, &list);
continue;
}
- *
nex
t = '.';
+ *
dotdo
t = '.';
}
if (*arg == '^') {
flags = UNINTERESTING;
}
if (*arg == '^') {
flags = UNINTERESTING;
@@
-581,6
+589,7
@@
int main(int argc, char **argv)
}
save_commit_buffer = verbose_header;
}
save_commit_buffer = verbose_header;
+ track_object_refs = 0;
if (!merge_order) {
sort_by_date(&list);
if (!merge_order) {
sort_by_date(&list);