mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-02 11:46:11 +02:00
Code

Merge branch 'js/no-limit-boundary' 

* js/no-limit-boundary:
  rev-list --max-age, --max-count: support --boundary
This commit is contained in:
Junio C Hamano 2007-02-24 01:47:56 -08:00
parent cc58fc0684 c4025103fa
commit 503ca3a9f2
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
revision.c
View File

@ -1233,9 +1233,15 @@ static struct commit *get_revision_1(struct rev_info *revs)
*/
if (!revs->limited) {
if (revs->max_age != -1 &&
(commit->date < revs->max_age))
continue;
add_parents_to_list(revs, commit, &revs->commits);
(commit->date < revs->max_age)) {
if (revs->boundary)
commit->object.flags |=
BOUNDARY_SHOW | BOUNDARY;
else
continue;
} else
add_parents_to_list(revs, commit,
&revs->commits);
}
if (commit->object.flags & SHOWN)
continue;
@ -1336,7 +1342,18 @@ struct commit *get_revision(struct rev_info *revs)
case -1:
break;
case 0:
return NULL;
if (revs->boundary) {
struct commit_list *list = revs->commits;
while (list) {
list->item->object.flags |=
BOUNDARY_SHOW | BOUNDARY;
list = list->next;
}
/* all remaining commits are boundary commits */
revs->max_count = -1;
revs->limited = 1;
} else
return NULL;
default:
revs->max_count--;
}