t5541: test more combinations of --progress

diff --git a/builtin/merge.c b/builtin/merge.c
index 3a451727d0e637ae197c9a1193435e57e84e6c58..b4fbc60e6d25157ed022ebd3f2bc8a2aeb774b0c 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -1283,7 +1283,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;