Staging
v0.5.1
https://github.com/git/git
Raw File
Tip revision: ce33288ea6b81a2f4f5aecd72177bcc8174562ae authored by Junio C Hamano on 21 January 2008, 01:04:53 UTC
GIT 1.5.4-rc4
Tip revision: ce33288
builtin-merge-ours.c
/*
 * Implementation of git-merge-ours.sh as builtin
 *
 * Copyright (c) 2007 Thomas Harning Jr
 * Original:
 * Original Copyright (c) 2005 Junio C Hamano
 *
 * Pretend we resolved the heads, but declare our tree trumps everybody else.
 */
#include "git-compat-util.h"
#include "builtin.h"

static const char *diff_index_args[] = {
	"diff-index", "--quiet", "--cached", "HEAD", "--", NULL
};
#define NARGS (ARRAY_SIZE(diff_index_args) - 1)

int cmd_merge_ours(int argc, const char **argv, const char *prefix)
{
	/*
	 * We need to exit with 2 if the index does not match our HEAD tree,
	 * because the current index is what we will be committing as the
	 * merge result.
	 */
	if (cmd_diff_index(NARGS, diff_index_args, prefix))
		exit(2);
	exit(0);
}
back to top