+static int do_merge(struct commit *commit, const char *arg, int arg_len,
+ int run_commit_flags, struct replay_opts *opts)
+{
+ int merge_arg_len;
+ struct strbuf ref_name = STRBUF_INIT;
+ struct commit *head_commit, *merge_commit, *i;
+ struct commit_list *common, *j, *reversed = NULL;
+ struct merge_options o;
+ int ret;
+ static struct lock_file lock;
+
+ for (merge_arg_len = 0; merge_arg_len < arg_len; merge_arg_len++)
+ if (isspace(arg[merge_arg_len]))
+ break;
+
+ if (hold_locked_index(&lock, LOCK_REPORT_ON_ERROR) < 0)
+ return -1;
+
+ head_commit = lookup_commit_reference_by_name("HEAD");
+ if (!head_commit) {
+ rollback_lock_file(&lock);
+ return error(_("cannot merge without a current revision"));
+ }
+
+ if (commit) {
+ const char *message = get_commit_buffer(commit, NULL);
+ const char *body;
+ int len;
+
+ if (!message) {
+ rollback_lock_file(&lock);
+ return error(_("could not get commit message of '%s'"),
+ oid_to_hex(&commit->object.oid));
+ }
+ write_author_script(message);
+ find_commit_subject(message, &body);
+ len = strlen(body);
+ if (write_message(body, len, git_path_merge_msg(), 0) < 0) {
+ error_errno(_("could not write '%s'"),
+ git_path_merge_msg());
+ unuse_commit_buffer(commit, message);
+ rollback_lock_file(&lock);
+ return -1;
+ }
+ unuse_commit_buffer(commit, message);
+ } else {
+ const char *p = arg + merge_arg_len;
+ struct strbuf buf = STRBUF_INIT;
+ int len;
+
+ strbuf_addf(&buf, "author %s", git_author_info(0));
+ write_author_script(buf.buf);
+ strbuf_reset(&buf);
+
+ p += strspn(p, " \t");
+ if (*p == '#' && isspace(p[1]))
+ p += 1 + strspn(p + 1, " \t");
+ if (*p)
+ len = strlen(p);
+ else {
+ strbuf_addf(&buf, "Merge branch '%.*s'",
+ merge_arg_len, arg);
+ p = buf.buf;
+ len = buf.len;
+ }
+
+ if (write_message(p, len, git_path_merge_msg(), 0) < 0) {
+ error_errno(_("could not write '%s'"),
+ git_path_merge_msg());
+ strbuf_release(&buf);
+ rollback_lock_file(&lock);
+ return -1;
+ }
+ strbuf_release(&buf);
+ }
+
+ strbuf_addf(&ref_name, "refs/rewritten/%.*s", merge_arg_len, arg);
+ merge_commit = lookup_commit_reference_by_name(ref_name.buf);
+ if (!merge_commit) {
+ /* fall back to non-rewritten ref or commit */
+ strbuf_splice(&ref_name, 0, strlen("refs/rewritten/"), "", 0);
+ merge_commit = lookup_commit_reference_by_name(ref_name.buf);
+ }
+ if (!merge_commit) {
+ error(_("could not resolve '%s'"), ref_name.buf);
+ strbuf_release(&ref_name);
+ rollback_lock_file(&lock);
+ return -1;
+ }
+ write_message(oid_to_hex(&merge_commit->object.oid), GIT_SHA1_HEXSZ,
+ git_path_merge_head(), 0);
+ write_message("no-ff", 5, git_path_merge_mode(), 0);
+
+ common = get_merge_bases(head_commit, merge_commit);
+ for (j = common; j; j = j->next)
+ commit_list_insert(j->item, &reversed);
+ free_commit_list(common);
+
+ read_cache();
+ init_merge_options(&o);
+ o.branch1 = "HEAD";
+ o.branch2 = ref_name.buf;
+ o.buffer_output = 2;
+
+ ret = merge_recursive(&o, head_commit, merge_commit, reversed, &i);
+ if (ret <= 0)
+ fputs(o.obuf.buf, stdout);
+ strbuf_release(&o.obuf);
+ if (ret < 0) {
+ strbuf_release(&ref_name);
+ rollback_lock_file(&lock);
+ return error(_("conflicts while merging '%.*s'"),
+ merge_arg_len, arg);
+ }
+
+ if (active_cache_changed &&
+ write_locked_index(&the_index, &lock, COMMIT_LOCK)) {
+ strbuf_release(&ref_name);
+ return error(_("merge: Unable to write new index file"));
+ }
+ rollback_lock_file(&lock);
+
+ ret = run_git_commit(git_path_merge_msg(), opts, run_commit_flags);
+ strbuf_release(&ref_name);
+
+ return ret;
+}
+