mirror of
https://github.com/git/git.git
synced 2024-11-27 03:53:55 +08:00
03eae9afb4
Instead of including USE_THE_REPOSITORY_VARIABLE by default on every builtin, remove it from builtin.h and add it to all the builtins that include builtin.h (by definition, that means all builtins/*.c). Also, remove the include statement for repository.h since it gets brought in through builtin.h. The next step will be to migrate each builtin from having to use the_repository. Signed-off-by: John Cai <johncai86@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
38 lines
948 B
C
38 lines
948 B
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.
|
|
*/
|
|
#define USE_THE_REPOSITORY_VARIABLE
|
|
#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 UNUSED,
|
|
struct repository *repo UNUSED)
|
|
{
|
|
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 (repo_read_index(the_repository) < 0)
|
|
die_errno("read_cache failed");
|
|
if (index_differs_from(the_repository, "HEAD", NULL, 0))
|
|
return 2;
|
|
return 0;
|
|
}
|