mirror of
https://github.com/git/git.git
synced 2024-11-18 23:53:59 +01:00
58e28af6a4
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>
38 lines
773 B
C
38 lines
773 B
C
#ifndef COMMIT_H
|
|
#define COMMIT_H
|
|
|
|
#include "object.h"
|
|
#include "tree.h"
|
|
|
|
struct commit_list {
|
|
struct commit *item;
|
|
struct commit_list *next;
|
|
};
|
|
|
|
struct commit {
|
|
struct object object;
|
|
unsigned long date;
|
|
struct commit_list *parents;
|
|
struct tree *tree;
|
|
};
|
|
|
|
extern const char *commit_type;
|
|
|
|
struct commit *lookup_commit(unsigned char *sha1);
|
|
|
|
int parse_commit(struct commit *item);
|
|
|
|
void commit_list_insert(struct commit *item, struct commit_list **list_p);
|
|
|
|
void free_commit_list(struct commit_list *list);
|
|
|
|
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,
|
|
unsigned int mark);
|
|
|
|
#endif /* COMMIT_H */
|