2018-07-20 18:33:02 +02:00
|
|
|
#ifndef __COMMIT_REACH_H__
|
|
|
|
#define __COMMIT_REACH_H__
|
|
|
|
|
2018-07-20 18:33:08 +02:00
|
|
|
#include "commit-slab.h"
|
|
|
|
|
2018-07-20 18:33:02 +02:00
|
|
|
struct commit;
|
|
|
|
struct commit_list;
|
2018-07-20 18:33:08 +02:00
|
|
|
struct contains_cache;
|
|
|
|
struct ref_filter;
|
2018-07-20 18:33:02 +02:00
|
|
|
|
|
|
|
struct commit_list *get_merge_bases_many(struct commit *one,
|
|
|
|
int n,
|
|
|
|
struct commit **twos);
|
|
|
|
struct commit_list *get_merge_bases_many_dirty(struct commit *one,
|
|
|
|
int n,
|
|
|
|
struct commit **twos);
|
|
|
|
struct commit_list *get_merge_bases(struct commit *one, struct commit *two);
|
|
|
|
struct commit_list *get_octopus_merge_bases(struct commit_list *in);
|
|
|
|
|
|
|
|
/* To be used only when object flags after this call no longer matter */
|
|
|
|
struct commit_list *get_merge_bases_many_dirty(struct commit *one, int n, struct commit **twos);
|
|
|
|
|
|
|
|
int is_descendant_of(struct commit *commit, struct commit_list *with_commit);
|
|
|
|
int in_merge_bases_many(struct commit *commit, int nr_reference, struct commit **reference);
|
|
|
|
int in_merge_bases(struct commit *commit, struct commit *reference);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Takes a list of commits and returns a new list where those
|
|
|
|
* have been removed that can be reached from other commits in
|
|
|
|
* the list. It is useful for, e.g., reducing the commits
|
|
|
|
* randomly thrown at the git-merge command and removing
|
|
|
|
* redundant commits that the user shouldn't have given to it.
|
|
|
|
*
|
|
|
|
* This function destroys the STALE bit of the commit objects'
|
|
|
|
* flags.
|
|
|
|
*/
|
|
|
|
struct commit_list *reduce_heads(struct commit_list *heads);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Like `reduce_heads()`, except it replaces the list. Use this
|
|
|
|
* instead of `foo = reduce_heads(foo);` to avoid memory leaks.
|
|
|
|
*/
|
|
|
|
void reduce_heads_replace(struct commit_list **heads);
|
|
|
|
|
2018-07-20 18:33:06 +02:00
|
|
|
int ref_newer(const struct object_id *new_oid, const struct object_id *old_oid);
|
|
|
|
|
2018-07-20 18:33:08 +02:00
|
|
|
/*
|
|
|
|
* Unknown has to be "0" here, because that's the default value for
|
|
|
|
* contains_cache slab entries that have not yet been assigned.
|
|
|
|
*/
|
|
|
|
enum contains_result {
|
|
|
|
CONTAINS_UNKNOWN = 0,
|
|
|
|
CONTAINS_NO,
|
|
|
|
CONTAINS_YES
|
|
|
|
};
|
|
|
|
|
|
|
|
define_commit_slab(contains_cache, enum contains_result);
|
|
|
|
|
|
|
|
int commit_contains(struct ref_filter *filter, struct commit *commit,
|
|
|
|
struct commit_list *list, struct contains_cache *cache);
|
|
|
|
|
2018-07-20 18:33:02 +02:00
|
|
|
#endif
|