Skip to main content

Browse the archive

Staging
v0.5.1
https://github.com/git/git
23 January 2022, 05:21:09 UTC
Revision f29ac4f1b04c9cf84509e4a80f27f10b4373a446 authored by Junio C Hamano on 25 April 2009, 05:54:40 UTC, committed by Junio C Hamano on 25 April 2009, 05:59:35 UTC 
GIT 1.6.3-rc2
 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 86e081a
Raw File
Tip revision: f29ac4f1b04c9cf84509e4a80f27f10b4373a446 authored by Junio C Hamano on 25 April 2009, 05:54:40 UTC
GIT 1.6.3-rc2
Tip revision: f29ac4f
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