From: Kacper Kornet Date: Tue, 27 Nov 2012 23:00:15 GMT Subject: [PATCH v2 1/3] Process MERGE_MODE before MERGE_HEAD Message-ID: <1354057217-65886-2-git-send-email-draenog@pld-linux.org> In-Reply-To: <1354057217-65886-1-git-send-email-draenog@pld-linux.org> It is in preparation to introduce --transpose-parents option to git-merge, when the content of MERGE_MODE will dictate how the MERGE_HEAD is interpreted. Signed-off-by: Kacper Kornet --- builtin/commit.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/builtin/commit.c b/builtin/commit.c index 1dd2ec5..273332f 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -1481,6 +1481,12 @@ int cmd_commit(int argc, const char **argv, const char *prefix) if (!reflog_msg) reflog_msg = "commit (merge)"; + if (!stat(git_path("MERGE_MODE"), &statbuf)) { + if (strbuf_read_file(&sb, git_path("MERGE_MODE"), 0) < 0) + die_errno(_("could not read MERGE_MODE")); + if (!strcmp(sb.buf, "no-ff")) + allow_fast_forward = 0; + } pptr = &commit_list_insert(current_head, pptr)->next; fp = fopen(git_path("MERGE_HEAD"), "r"); if (fp == NULL) @@ -1496,12 +1502,6 @@ int cmd_commit(int argc, const char **argv, const char *prefix) } fclose(fp); strbuf_release(&m); - if (!stat(git_path("MERGE_MODE"), &statbuf)) { - if (strbuf_read_file(&sb, git_path("MERGE_MODE"), 0) < 0) - die_errno(_("could not read MERGE_MODE")); - if (!strcmp(sb.buf, "no-ff")) - allow_fast_forward = 0; - } if (allow_fast_forward) parents = reduce_heads(parents); } else { -- 1.8.0.1