#include <git/kigit_merge_blob_utils.h>
#include <git/kicad_git_memory.h>
#include <git2/buffer.h>
#include <git2/deprecated.h>
#include <cstring>

Go to the source code of this file.

Namespaces
namespace	KIGIT

Functions
std::string	KIGIT::BlobToString (git_blob *aBlob)
	Copy a libgit2 blob's raw bytes into a std::string.

int	KIGIT::WriteToGitBuf (git_buf *aBuf, const std::string &aContent)
	Allocate a libgit2-owned buffer big enough for `aContent` and copy the bytes plus a trailing NUL.

int	KIGIT::LoadMergeBlobs (const git_merge_driver_source *aSource, MERGE_BLOBS &aBlobs)
	Look up the ancestor/ours/theirs blobs of a merge-driver source and decode them into `aBlobs`.

bool	KIGIT::TryTrivialMerge (const MERGE_BLOBS &aBlobs, git_buf aResult, int aRc)
	Resolve the trivial 3-way cases (identical sides, or one side unchanged from the ancestor).

Namespaces

Functions