summaryrefslogtreecommitdiff
path: root/commit.h
diff options
context:
space:
mode:
authorDaniel Barkalow <barkalow@iabervon.org>2005-04-23 20:29:22 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-23 20:29:22 -0700
commit58e28af6a4d4d4faa1fa628e91c0b33c2b87aade (patch)
tree6f24c9b481d76e067d64bac1a8dbd5cf5d0dfb05 /commit.h
parent4056c09114e66ce3c2368551f0122e83628750d6 (diff)
downloadgit-58e28af6a4d4d4faa1fa628e91c0b33c2b87aade.tar.gz
[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>
Diffstat (limited to 'commit.h')
-rw-r--r--commit.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/commit.h b/commit.h
index c8684d1cd0..d61d084c89 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 */