mirror of
https://git.proxmox.com/git/libgit2
synced 2025-05-04 05:13:50 +00:00
0984c8768d
Moved it into graph.{c,h} which i created for the new "graph"
functions namespace. Also adjusted the function prototype
to use `size_t` and `const git_oid *`.
56 lines
1.3 KiB
C
56 lines
1.3 KiB
C
/*
|
|
* Copyright (C) 2009-2012 the libgit2 contributors
|
|
*
|
|
* This file is part of libgit2, distributed under the GNU GPL v2 with
|
|
* a Linking Exception. For full terms see the included COPYING file.
|
|
*/
|
|
#ifndef INCLUDE_git_merge_h__
|
|
#define INCLUDE_git_merge_h__
|
|
|
|
#include "common.h"
|
|
#include "types.h"
|
|
#include "oid.h"
|
|
|
|
/**
|
|
* @file git2/merge.h
|
|
* @brief Git merge-base routines
|
|
* @defgroup git_revwalk Git merge-base routines
|
|
* @ingroup Git
|
|
* @{
|
|
*/
|
|
GIT_BEGIN_DECL
|
|
|
|
/**
|
|
* Find a merge base between two commits
|
|
*
|
|
* @param out the OID of a merge base between 'one' and 'two'
|
|
* @param repo the repository where the commits exist
|
|
* @param one one of the commits
|
|
* @param two the other commit
|
|
* @return Zero on success; GIT_ENOTFOUND or -1 on failure.
|
|
*/
|
|
GIT_EXTERN(int) git_merge_base(
|
|
git_oid *out,
|
|
git_repository *repo,
|
|
const git_oid *one,
|
|
const git_oid *two);
|
|
|
|
/**
|
|
* Find a merge base given a list of commits
|
|
*
|
|
* @param out the OID of a merge base considering all the commits
|
|
* @param repo the repository where the commits exist
|
|
* @param input_array oids of the commits
|
|
* @param length The number of commits in the provided `input_array`
|
|
* @return Zero on success; GIT_ENOTFOUND or -1 on failure.
|
|
*/
|
|
GIT_EXTERN(int) git_merge_base_many(
|
|
git_oid *out,
|
|
git_repository *repo,
|
|
const git_oid input_array[],
|
|
size_t length);
|
|
|
|
/** @} */
|
|
GIT_END_DECL
|
|
#endif
|