[RFC PATCH 12/35] commit: support for multiple MERGE_MODE
flat view
STALE1923d
From: Felipe Contreras <hidden>
Date: 2021-07-05 12:32:35
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: Felipe Contreras <redacted> --- builtin/commit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/commit.c b/builtin/commit.c
index 190d215d43..f9dd155566 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c@@ -1742,7 +1742,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix) if (!stat(git_path_merge_mode(the_repository), &statbuf)) { if (strbuf_read_file(&sb, git_path_merge_mode(the_repository), 0) < 0) die_errno(_("could not read MERGE_MODE")); - if (!strcmp(sb.buf, "no-ff")) + if (strstr(sb.buf, "no-ff")) allow_fast_forward = 0; } if (allow_fast_forward)
--
2.32.0.36.g70aac2b1aa