mirror of
https://github.com/git/git
synced 2024-10-30 14:03:28 +00:00
c2e86addb8
Fix warnings from 'make check'. - These files don't include 'builtin.h' causing sparse to complain that cmd_* isn't declared: builtin/clone.c:364, builtin/fetch-pack.c:797, builtin/fmt-merge-msg.c:34, builtin/hash-object.c:78, builtin/merge-index.c:69, builtin/merge-recursive.c:22 builtin/merge-tree.c:341, builtin/mktag.c:156, builtin/notes.c:426 builtin/notes.c:822, builtin/pack-redundant.c:596, builtin/pack-refs.c:10, builtin/patch-id.c:60, builtin/patch-id.c:149, builtin/remote.c:1512, builtin/remote-ext.c:240, builtin/remote-fd.c:53, builtin/reset.c:236, builtin/send-pack.c:384, builtin/unpack-file.c:25, builtin/var.c:75 - These files have symbols which should be marked static since they're only file scope: submodule.c:12, diff.c:631, replace_object.c:92, submodule.c:13, submodule.c:14, trace.c:78, transport.c:195, transport-helper.c:79, unpack-trees.c:19, url.c:3, url.c:18, url.c:104, url.c:117, url.c:123, url.c:129, url.c:136, thread-utils.c:21, thread-utils.c:48 - These files redeclare symbols to be different types: builtin/index-pack.c:210, parse-options.c:564, parse-options.c:571, usage.c:49, usage.c:58, usage.c:63, usage.c:72 - These files use a literal integer 0 when they really should use a NULL pointer: daemon.c:663, fast-import.c:2942, imap-send.c:1072, notes-merge.c:362 While we're in the area, clean up some unused #includes in builtin files (mostly exec_cmd.h). Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
80 lines
2 KiB
C
80 lines
2 KiB
C
#include "builtin.h"
|
|
#include "commit.h"
|
|
#include "tag.h"
|
|
#include "merge-recursive.h"
|
|
#include "xdiff-interface.h"
|
|
|
|
static const char builtin_merge_recursive_usage[] =
|
|
"git %s <base>... -- <head> <remote> ...";
|
|
|
|
static const char *better_branch_name(const char *branch)
|
|
{
|
|
static char githead_env[8 + 40 + 1];
|
|
char *name;
|
|
|
|
if (strlen(branch) != 40)
|
|
return branch;
|
|
sprintf(githead_env, "GITHEAD_%s", branch);
|
|
name = getenv(githead_env);
|
|
return name ? name : branch;
|
|
}
|
|
|
|
int cmd_merge_recursive(int argc, const char **argv, const char *prefix)
|
|
{
|
|
const unsigned char *bases[21];
|
|
unsigned bases_count = 0;
|
|
int i, failed;
|
|
unsigned char h1[20], h2[20];
|
|
struct merge_options o;
|
|
struct commit *result;
|
|
|
|
init_merge_options(&o);
|
|
if (argv[0] && !suffixcmp(argv[0], "-subtree"))
|
|
o.subtree_shift = "";
|
|
|
|
if (argc < 4)
|
|
usagef(builtin_merge_recursive_usage, argv[0]);
|
|
|
|
for (i = 1; i < argc; ++i) {
|
|
const char *arg = argv[i];
|
|
|
|
if (!prefixcmp(arg, "--")) {
|
|
if (!arg[2])
|
|
break;
|
|
if (parse_merge_opt(&o, arg + 2))
|
|
die("Unknown option %s", arg);
|
|
continue;
|
|
}
|
|
if (bases_count < ARRAY_SIZE(bases)-1) {
|
|
unsigned char *sha = xmalloc(20);
|
|
if (get_sha1(argv[i], sha))
|
|
die("Could not parse object '%s'", argv[i]);
|
|
bases[bases_count++] = sha;
|
|
}
|
|
else
|
|
warning("Cannot handle more than %d bases. "
|
|
"Ignoring %s.",
|
|
(int)ARRAY_SIZE(bases)-1, argv[i]);
|
|
}
|
|
if (argc - i != 3) /* "--" "<head>" "<remote>" */
|
|
die("Not handling anything other than two heads merge.");
|
|
|
|
o.branch1 = argv[++i];
|
|
o.branch2 = argv[++i];
|
|
|
|
if (get_sha1(o.branch1, h1))
|
|
die("Could not resolve ref '%s'", o.branch1);
|
|
if (get_sha1(o.branch2, h2))
|
|
die("Could not resolve ref '%s'", o.branch2);
|
|
|
|
o.branch1 = better_branch_name(o.branch1);
|
|
o.branch2 = better_branch_name(o.branch2);
|
|
|
|
if (o.verbosity >= 3)
|
|
printf("Merging %s with %s\n", o.branch1, o.branch2);
|
|
|
|
failed = merge_recursive_generic(&o, h1, h2, bases_count, bases, &result);
|
|
if (failed < 0)
|
|
return 128; /* die() error code */
|
|
return failed;
|
|
}
|