gitweb: Refactor checking if part of project info need filling

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