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

26
merge-base.c
View File

@ -6,29 +6,11 @@ static struct commit *process_list(struct commit_list **list_p, int this_mark,
int other_mark)
{
struct commit *item = (*list_p)->item;
if (item->object.flags & this_mark) {
/*
printf("%d already seen %s %x\n",
this_mark
sha1_to_hex(posn->parent->sha1),
posn->parent->flags);
*/
/* do nothing; this indicates that this side
* split and reformed, and we only need to
* mark it once.
*/
*list_p = (*list_p)->next;
} else if (item->object.flags & other_mark) {
if (item->object.flags & other_mark) {
return item;
} else {
/*
printf("%d based on %s\n",
this_mark,
sha1_to_hex(posn->parent->sha1));
*/
pop_most_recent_commit(list_p);
item->object.flags |= this_mark;
pop_most_recent_commit(list_p, this_mark);
}
return NULL;
}
@ -39,7 +21,9 @@ struct commit *common_ancestor(struct commit *rev1, struct commit *rev2)
struct commit_list *rev2list = NULL;
commit_list_insert(rev1, &rev1list);
rev1->object.flags |= 0x1;
commit_list_insert(rev2, &rev2list);
rev2->object.flags |= 0x2;
parse_commit(rev1);
parse_commit(rev2);