diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-11-06 13:11:21 +0900 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-11-06 13:11:21 +0900 |
commit | 22ddc4bf29160d04eaff78d1acb04ca153ec5dde (patch) | |
tree | df2853c7a517ec21a30d46b43460264eb5a265a4 /builtin/merge-ours.c | |
parent | Merge branch 'ma/lockfile-fixes' (diff) | |
parent | merge-ours: do not use cmd_*() as a subroutine (diff) | |
download | tgif-22ddc4bf29160d04eaff78d1acb04ca153ec5dde.tar.xz |
Merge branch 'jc/no-cmd-as-subroutine'
Calling cmd_foo() as if it is a general purpose helper function is
a no-no. Correct two instances of such to set an example.
* jc/no-cmd-as-subroutine:
merge-ours: do not use cmd_*() as a subroutine
describe: do not use cmd_*() as a subroutine
Diffstat (limited to 'builtin/merge-ours.c')
-rw-r--r-- | builtin/merge-ours.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/builtin/merge-ours.c b/builtin/merge-ours.c index 684411694f..beb0623d56 100644 --- a/builtin/merge-ours.c +++ b/builtin/merge-ours.c @@ -9,26 +9,24 @@ */ #include "git-compat-util.h" #include "builtin.h" +#include "diff.h" static const char builtin_merge_ours_usage[] = "git merge-ours <base>... -- HEAD <remote>..."; -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) { if (argc == 2 && !strcmp(argv[1], "-h")) usage(builtin_merge_ours_usage); /* - * 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. + * The contents of the current index becomes the tree we + * commit. The index must match HEAD, or this merge cannot go + * through. */ - if (cmd_diff_index(NARGS, diff_index_args, prefix)) + if (read_cache() < 0) + die_errno("read_cache failed"); + if (index_differs_from("HEAD", 0, 0)) exit(2); exit(0); } |