From: Junio C Hamano Date: Tue, 08 Nov 2011 03:00:45 GMT Subject: [PATCH v2 12/12] merge: force edit mode when merging a tag object Message-ID: <1320721245-13223-13-git-send-email-gitster@pobox.com> In-Reply-To: <1320721245-13223-1-git-send-email-gitster@pobox.com> 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 --- 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