7 #include "merge-recursive.h"
8 #include "object-name.h"
9 #include "repository.h"
10 #include "xdiff-interface.h"
12 static const char builtin_merge_recursive_usage
[] =
13 "git %s <base>... -- <head> <remote> ...";
15 static char *better_branch_name(const char *branch
)
17 static char githead_env
[8 + GIT_MAX_HEXSZ
+ 1];
20 if (strlen(branch
) != the_hash_algo
->hexsz
)
21 return xstrdup(branch
);
22 xsnprintf(githead_env
, sizeof(githead_env
), "GITHEAD_%s", branch
);
23 name
= getenv(githead_env
);
24 return xstrdup(name
? name
: branch
);
27 int cmd_merge_recursive(int argc
, const char **argv
, const char *prefix UNUSED
)
29 const struct object_id
*bases
[21];
30 unsigned bases_count
= 0;
32 struct object_id h1
, h2
;
33 struct merge_options o
;
34 char *better1
, *better2
;
35 struct commit
*result
;
37 init_merge_options(&o
, the_repository
);
38 if (argv
[0] && ends_with(argv
[0], "-subtree"))
42 usagef(builtin_merge_recursive_usage
, argv
[0]);
44 for (i
= 1; i
< argc
; ++i
) {
45 const char *arg
= argv
[i
];
47 if (starts_with(arg
, "--")) {
50 if (parse_merge_opt(&o
, arg
+ 2))
51 die(_("unknown option %s"), arg
);
54 if (bases_count
< ARRAY_SIZE(bases
)-1) {
55 struct object_id
*oid
= xmalloc(sizeof(struct object_id
));
56 if (repo_get_oid(the_repository
, argv
[i
], oid
))
57 die(_("could not parse object '%s'"), argv
[i
]);
58 bases
[bases_count
++] = oid
;
61 warning(Q_("cannot handle more than %d base. "
63 "cannot handle more than %d bases. "
66 (int)ARRAY_SIZE(bases
)-1, argv
[i
]);
68 if (argc
- i
!= 3) /* "--" "<head>" "<remote>" */
69 die(_("not handling anything other than two heads merge."));
71 if (repo_read_index_unmerged(the_repository
))
72 die_resolve_conflict("merge");
74 o
.branch1
= argv
[++i
];
75 o
.branch2
= argv
[++i
];
77 if (repo_get_oid(the_repository
, o
.branch1
, &h1
))
78 die(_("could not resolve ref '%s'"), o
.branch1
);
79 if (repo_get_oid(the_repository
, o
.branch2
, &h2
))
80 die(_("could not resolve ref '%s'"), o
.branch2
);
82 o
.branch1
= better1
= better_branch_name(o
.branch1
);
83 o
.branch2
= better2
= better_branch_name(o
.branch2
);
86 printf(_("Merging %s with %s\n"), o
.branch1
, o
.branch2
);
88 failed
= merge_recursive_generic(&o
, &h1
, &h2
, bases_count
, bases
, &result
);
94 return 128; /* die() error code */