Skip to main content

Browse the archive

Staging
v0.5.1
https://github.com/git/git
23 January 2022, 05:21:09 UTC
Revision 9bd81e4249a419f9cde8fd68e033e263533f4914 authored by Junio C Hamano on 25 May 2008, 21:25:02 UTC, committed by Junio C Hamano on 25 May 2008, 21:25:02 UTC 
Merge branch 'js/config-cb'
 
* js/config-cb:
  Provide git_config with a callback-data parameter

Conflicts:

	builtin-add.c
	builtin-cat-file.c
2 parent s 450c5ae + ef90d6d
Raw File
Tip revision: 9bd81e4249a419f9cde8fd68e033e263533f4914 authored by Junio C Hamano on 25 May 2008, 21:25:02 UTC
Merge branch 'js/config-cb'
Tip revision: 9bd81e4
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