Merge branch 'cc/fix-missing-va-end-in-revert'

diff --git a/builtin/merge.c b/builtin/merge.c
index cb8f14910b93edb7f1bfa6a4ee82f6a3d9fd7e40..08e01e8a60d7d7f9c60e9e7a3a2f8b4d66c12ce3 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -1325,11 +1325,8 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
                if (!fast_forward_only &&
                    merge_remote_util(commit) &&
                    merge_remote_util(commit)->obj &&
-                   merge_remote_util(commit)->obj->type == OBJ_TAG) {
-                       if (option_edit < 0)
-                               option_edit = 1;
+                   merge_remote_util(commit)->obj->type == OBJ_TAG)
                        allow_fast_forward = 0;
-               }
        }
 
        if (option_edit < 0)