Merge branch 'jc/merge-ff-only-stronger-than-signed-merge'

diff --git a/builtin/merge.c b/builtin/merge.c
index 62c7b681778d6a3fcffc792cc8a131cbd7f45f90..7e6db3bb35517b78f288202a635fcaa9a2353235 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -1320,7 +1320,8 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
                            sha1_to_hex(commit->object.sha1));
                setenv(buf.buf, argv[i], 1);
                strbuf_reset(&buf);
-               if (merge_remote_util(commit) &&
+               if (!fast_forward_only &&
+                   merge_remote_util(commit) &&
                    merge_remote_util(commit)->obj &&
                    merge_remote_util(commit)->obj->type == OBJ_TAG) {
                        option_edit = 1;