mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] Allow multiple date-ordered lists

Browse Source 
Make pop_most_recent_commit() return the same objects multiple times, but only
if called with different bits to mark.

This is necessary to make merge-base work again.

Signed-Off-By: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Daniel Barkalow
2005-04-23 20:29:22 -07:00
committed by Linus Torvalds
parent 4056c09114
commit 58e28af6a4
4 changed files with 13 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
commit.c
View File

@ -114,7 +114,8 @@ void sort_by_date(struct commit_list **list)
*list = ret;
}
struct commit *pop_most_recent_commit(struct commit_list **list)
struct commit *pop_most_recent_commit(struct commit_list **list,
unsigned int mark)
{
struct commit *ret = (*list)->item;
struct commit_list *parents = ret->parents;
@ -125,8 +126,9 @@ struct commit *pop_most_recent_commit(struct commit_list **list)
while (parents) {
struct commit *commit = parents->item;
if (!commit->object.parsed) {
parse_commit(commit);
parse_commit(commit);
if (!(commit->object.flags & mark)) {
commit->object.flags |= mark;
insert_by_date(list, commit);
}
parents = parents->next;