Skip to main content

Browse the archive

Staging
v0.5.1
https://github.com/git/git
23 January 2022, 05:21:09 UTC
Revision ea02eef096d4bfcbb83e76cfab0fcb42dbcad35e authored by Junio C Hamano on 17 August 2008, 18:42:10 UTC, committed by Junio C Hamano on 17 August 2008, 18:42:10 UTC 
GIT 1.6.0
 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 373a273
Raw File
Tip revision: ea02eef096d4bfcbb83e76cfab0fcb42dbcad35e authored by Junio C Hamano on 17 August 2008, 18:42:10 UTC
GIT 1.6.0
Tip revision: ea02eef
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