summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Barkalow <barkalow@iabervon.org>2005-04-24 03:29:22 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-24 03:29:22 (GMT)
commit58e28af6a4d4d4faa1fa628e91c0b33c2b87aade (patch)
tree6f24c9b481d76e067d64bac1a8dbd5cf5d0dfb05
parent4056c09114e66ce3c2368551f0122e83628750d6 (diff)
downloadgit-58e28af6a4d4d4faa1fa628e91c0b33c2b87aade.zip
git-58e28af6a4d4d4faa1fa628e91c0b33c2b87aade.tar.gz
git-58e28af6a4d4d4faa1fa628e91c0b33c2b87aade.tar.bz2
[PATCH] Allow multiple date-ordered lists
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>
-rw-r--r--commit.c8
-rw-r--r--commit.h3
-rw-r--r--merge-base.c26
-rw-r--r--rev-list.c2
4 files changed, 13 insertions, 26 deletions
diff --git a/commit.c b/commit.c
index 0243e77..2502688 100644
--- a/commit.c
+++ b/commit.c
@@ -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;
diff --git a/commit.h b/commit.h
index c8684d1..d61d084 100644
--- a/commit.h
+++ b/commit.h
@@ -31,6 +31,7 @@ void sort_by_date(struct commit_list **list);
/** Removes the first commit from a list sorted by date, and adds all
* of its parents.
**/
-struct commit *pop_most_recent_commit(struct commit_list **list);
+struct commit *pop_most_recent_commit(struct commit_list **list,
+ unsigned int mark);
#endif /* COMMIT_H */
diff --git a/merge-base.c b/merge-base.c
index 0e4c58e..2c40881 100644
--- a/merge-base.c
+++ b/merge-base.c
@@ -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);
diff --git a/rev-list.c b/rev-list.c
index 1c797d2..77bfc29 100644
--- a/rev-list.c
+++ b/rev-list.c
@@ -16,7 +16,7 @@ int main(int argc, char **argv)
commit_list_insert(commit, &list);
do {
- struct commit *commit = pop_most_recent_commit(&list);
+ struct commit *commit = pop_most_recent_commit(&list, 0x1);
printf("%s\n", sha1_to_hex(commit->object.sha1));
} while (list);
return 0;