[thirdparty/git.git] / 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"
#include "diff.h"

static const char builtin_merge_ours_usage[] =
	"git merge-ours <base>... -- HEAD <remote>...";

int cmd_merge_ours(int argc, const char **argv, const char *prefix)
{
	if (argc == 2 && !strcmp(argv[1], "-h"))
		usage(builtin_merge_ours_usage);

	/*
	 * The contents of the current index becomes the tree we
	 * commit.  The index must match HEAD, or this merge cannot go
	 * through.
	 */
	if (read_cache() < 0)
		die_errno("read_cache failed");
	if (index_differs_from(the_repository, "HEAD", NULL, 0))
		exit(2);
	exit(0);
}
Commit	Line	Data
a00a42ae TH	1	/*
	2	* Implementation of git-merge-ours.sh as builtin
	3	*
	4	* Copyright (c) 2007 Thomas Harning Jr
	5	* Original:
	6	* Original Copyright (c) 2005 Junio C Hamano
	7	*
	8	* Pretend we resolved the heads, but declare our tree trumps everybody else.
	9	*/
	10	#include "git-compat-util.h"
	11	#include "builtin.h"
a92b1095	12	#include "diff.h"
a00a42ae	13
20c7e3d5 JN	14	static const char builtin_merge_ours_usage[] =
	15	"git merge-ours <base>... -- HEAD <remote>...";
	16
a00a42ae TH	17	int cmd_merge_ours(int argc, const char *argv, const char prefix)
a00a42ae TH	18	{
20c7e3d5 JN	19	if (argc == 2 && !strcmp(argv[1], "-h"))
	20	usage(builtin_merge_ours_usage);
	21
a00a42ae	22	/*
a92b1095 JH	23	* The contents of the current index becomes the tree we
	24	* commit. The index must match HEAD, or this merge cannot go
	25	* through.
a00a42ae	26	*/
a92b1095 JH	27	if (read_cache() < 0)
a92b1095 JH	28	die_errno("read_cache failed");
ffc00a48	29	if (index_differs_from(the_repository, "HEAD", NULL, 0))
a00a42ae TH	30	exit(2);
	31	exit(0);
	32	}