diff options
| author | Thomas Harning <harningt@gmail.com> | 2007-11-22 20:19:40 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-22 22:21:59 (GMT) |
| commit | a00a42ae33708caa742d9e9fbf10692cfa42f032 (patch) | |
| tree | d14676ffff8533ab5edd6c9bc790097c6f7e5dd6 /builtin-merge-ours.c | |
| parent | a7d9da6c972cb7bc79ef47ad7199dfb2a8dcf67f (diff) | |
| download | git-a00a42ae33708caa742d9e9fbf10692cfa42f032.zip git-a00a42ae33708caa742d9e9fbf10692cfa42f032.tar.gz git-a00a42ae33708caa742d9e9fbf10692cfa42f032.tar.bz2 | |
git-merge-ours: make it a builtin.
Except that this fixes a longstanding corner case bug by
tightening the way underlying diff-index command is run, it is
functionally equivalent to the scripted version.
Signed-off-by: Thomas Harning Jr <harningt@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-merge-ours.c')
| -rw-r--r-- | builtin-merge-ours.c | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/builtin-merge-ours.c b/builtin-merge-ours.c new file mode 100644 index 0000000..8f5bbaf --- /dev/null +++ b/builtin-merge-ours.c @@ -0,0 +1,28 @@ +/* + * 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); +} |