You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
29 lines
751 B
29 lines
751 B
17 years ago
|
/*
|
||
|
|
* 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);
|
||
|
|
}
|