git.cpp File Reference

#include "git/addurldialog.h"
#include "git/commitdialog.h"
#include "git/credentialsdialog.h"
#include "git/remotenamedialog.h"
#include <git/git.h>
#include <git/ui_git.h>
#include <git2.h>
#include <iostream>
#include <qdir.h>
#include <git/git_util.h>
#include <cstring>
#include <unistd.h>
#include <errno.h>

Macros
#define	MERGE_COMMIT_MSG   "Merge %s '%s'"

Functions
int	credentialsCallback (git_cred **out, const char *url, const char *username_from_url, unsigned int allowed_types, void *payload)
int	print_matched_cb (const char *path, const char *matched_pathspec, void *payload)
bool	check_lg2 (int error, const char *message, const char *extra)
static int	readline (char **out)
static int	ask (char **out, const char *prompt, char optional, bool secure)
int	cred_acquire_cb (git_credential **out, const char *url, const char *username_from_url, unsigned int allowed_types, void *payload)
bool	match_arg (int *out, struct args_info *args, const char *opt)
static int	progress_cb (const char *str, int len, void *data)
static int	update_cb (const char *refname, const git_oid *a, const git_oid *b, void *data)
static int	transfer_progress_cb (const git_indexer_progress *stats, void *payload)
void *	xrealloc (void *oldp, size_t newsz)
static void	print_usage (void)
static void	merge_options_init (struct merge_options *opts)
static void	opts_add_refish (struct merge_options *opts, const char *refish)
static void	parse_options (const char **repo_path, struct merge_options *opts, int argc, char **argv)
int	resolve_refish (git_annotated_commit **commit, git_repository *repo, const char *refish)
static int	resolve_heads (git_repository *repo, struct merge_options *opts)
static int	perform_fastforward (git_repository *repo, const git_oid *target_oid, int is_unborn)
static void	output_conflicts (git_index *index)
static int	create_merge_commit (git_repository *repo, git_index *index, struct merge_options *opts)

Macro Definition Documentation

MERGE_COMMIT_MSG

#define MERGE_COMMIT_MSG   "Merge %s '%s'"

Function Documentation

ask()

static int ask ( char ** out, const char * prompt, char optional, bool secure = false )

static

check_lg2()

bool check_lg2	(	int	error,
		const char *	message,
		const char *	extra )

create_merge_commit()

static int create_merge_commit ( git_repository * repo, git_index * index, struct merge_options * opts )

static

cred_acquire_cb()

int cred_acquire_cb	(	git_credential **	out,
		const char *	url,
		const char *	username_from_url,
		unsigned int	allowed_types,
		void *	payload )

credentialsCallback()

int credentialsCallback	(	git_cred **	out,
		const char *	url,
		const char *	username_from_url,
		unsigned int	allowed_types,
		void *	payload )

match_arg()

bool match_arg	(	int *	out,
		struct args_info *	args,
		const char *	opt )

merge_options_init()

static void merge_options_init ( struct merge_options * opts )

static

opts_add_refish()

static void opts_add_refish ( struct merge_options * opts, const char * refish )

static

output_conflicts()

static void output_conflicts ( git_index * index )

static

parse_options()

static void parse_options ( const char ** repo_path, struct merge_options * opts, int argc, char ** argv )

static

perform_fastforward()

static int perform_fastforward ( git_repository * repo, const git_oid * target_oid, int is_unborn )

static

print_matched_cb()

int print_matched_cb	(	const char *	path,
		const char *	matched_pathspec,
		void *	payload )

print_usage()

static void print_usage ( void )

static

progress_cb()

static int progress_cb ( const char * str, int len, void * data )

static

readline()

static int readline ( char ** out )

static

resolve_heads()

static int resolve_heads ( git_repository * repo, struct merge_options * opts )

static

resolve_refish()

int resolve_refish	(	git_annotated_commit **	commit,
		git_repository *	repo,
		const char *	refish )

transfer_progress_cb()

static int transfer_progress_cb ( const git_indexer_progress * stats, void * payload )

static

update_cb()

static int update_cb ( const char * refname, const git_oid * a, const git_oid * b, void * data )

static

xrealloc()

void * xrealloc	(	void *	oldp,
		size_t	newsz )