mirror of
https://github.com/git/git
synced 2024-08-23 18:00:25 +00:00
![Ævar Arnfjörð Bjarmason](/assets/img/avatar_default.png)
Apply "index-compatibility.pending.cocci" rule to "builtin/*", but exclude those where we conflict with in-flight changes. As a result some of them end up using only "the_index", so let's have them use the more narrow "USE_THE_INDEX_VARIABLE" rather than "USE_THE_INDEX_COMPATIBILITY_MACROS". Manual changes not made by coccinelle, that were squashed in: * Whitespace-wrap argument lists for repo_hold_locked_index(), repo_read_index_preload() and repo_refresh_and_write_index(), in cases where the line became too long after the transformation. * Change "refresh_cache()" to "refresh_index()" in a comment in "builtin/update-index.c". * For those whose call was followed by perror("<macro-name>"), change it to perror("<function-name>"), referring to the new function. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
33 lines
857 B
C
33 lines
857 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.
|
|
*/
|
|
#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)
|
|
{
|
|
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;
|
|
}
|