[PATCH v2 12/12] merge: force edit mode when merging a tag object
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:52:26
Subsystem:
the rest · Maintainer:
Linus Torvalds
Now that we allow pulling a tag from the remote site to validate the authenticity, we should give the user the final chance to verify and edit the merge message. Signed-off-by: Junio C Hamano <redacted> --- builtin/merge.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/builtin/merge.c b/builtin/merge.c
index 7158e8e..3b3e374 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c@@ -1253,6 +1253,10 @@ 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) && + merge_remote_util(commit)->obj && + merge_remote_util(commit)->obj->type == OBJ_TAG) + option_edit = 1; } if (!use_strategies) {
--
1.7.8.rc0.128.g31aa4