send-email: be explicit with SSL certificate verification

diff --git a/builtin/merge.c b/builtin/merge.c
index e57c42c622b0d92c08bebf8eca8560503fe78b80..2ebe732896c1b3bfd920941b5182b793468c0afe 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -518,6 +518,19 @@ static void merge_name(const char *remote, struct strbuf *msg)
                strbuf_release(&line);
                goto cleanup;
        }
+
+       if (remote_head->util) {
+               struct merge_remote_desc *desc;
+               desc = merge_remote_util(remote_head);
+               if (desc && desc->obj && desc->obj->type == OBJ_TAG) {
+                       strbuf_addf(msg, "%s\t\t%s '%s'\n",
+                                   sha1_to_hex(desc->obj->sha1),
+                                   typename(desc->obj->type),
+                                   remote);
+                       goto cleanup;
+               }
+       }
+
        strbuf_addf(msg, "%s\t\tcommit '%s'\n",
                sha1_to_hex(remote_head->object.sha1), remote);
 cleanup:
@@ -1041,7 +1054,8 @@ static struct commit_list *collect_parents(struct commit *head_commit,
        for (i = 0; i < argc; i++) {
                struct commit *commit = get_merge_parent(argv[i]);
                if (!commit)
-                       die(_("%s - not something we can merge"), argv[i]);
+                       help_unknown_ref(argv[i], "merge",
+                                        "not something we can merge");
                remotes = &commit_list_insert(commit, remotes)->next;
        }
        *remotes = NULL;
@@ -1248,6 +1262,9 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
                        switch (signature_check.result) {
                        case 'G':
                                break;
+                       case 'U':
+                               die(_("Commit %s has an untrusted GPG signature, "
+                                     "allegedly by %s."), hex, signature_check.signer);
                        case 'B':
                                die(_("Commit %s has a bad GPG signature "
                                      "allegedly by %s."), hex, signature_check.signer);