From patchwork Sun Aug 30 22:01:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kazuhiro Kato via GitGitGadget X-Patchwork-Id: 11745345 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 549B8109B for ; Sun, 30 Aug 2020 22:01:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3CD6C2083E for ; Sun, 30 Aug 2020 22:01:42 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="L0gsMXVh" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726491AbgH3WBj (ORCPT ); Sun, 30 Aug 2020 18:01:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33716 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726472AbgH3WBb (ORCPT ); Sun, 30 Aug 2020 18:01:31 -0400 Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [IPv6:2a00:1450:4864:20::32a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EBDB3C061236 for ; Sun, 30 Aug 2020 15:01:30 -0700 (PDT) Received: by mail-wm1-x32a.google.com with SMTP id x9so3641836wmi.2 for ; Sun, 30 Aug 2020 15:01:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=eIlaYX3lT7GN4nnWu+Fg9tJR3gwdveb7QzVhDnDD6t0=; b=L0gsMXVhsxYuqZ098vct2T3Oqb/m9x4H3nIUomz2GcBPcmUbkgVAlsXZf/k1Be2lko yVJGVS6+P1siVvT6Fpcejc+dQUwLeprpUz6c+E8vaRTTxZu7S03mLekDW0RP6zH/mxFG +9fdTn2yAMBPjti/qFlP34MNuC7k9HiTtQXxG8rQlhDCsNH22/Lbf4nUWPrxq/qfJON6 cI/wRRpUhvmPZHfk0Y4dVtLi2dxFfjC1NLPtBcqka/A8U9uX2g5411hRLZmv0eexoPis JRdNzCaIzpsdLyBcJ1RXOyEDp/gAcN51WLvYV1iwAqJIzfWfOnGkLS8CCFDBsRNTB84v yt/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=eIlaYX3lT7GN4nnWu+Fg9tJR3gwdveb7QzVhDnDD6t0=; b=T1kpu0bD6UUuuHIS2L4gdXf/jFNL+ZWRJHQqpg0mGOjxjoLbKuuJ2VDyfQ9957rZIl gd6L7xQ/GkL8015S9SSOODy81NbZHLMs25JbbhrnUnmF88q2CJdAj2jt92mBGHo9nymK UheK9par7JRiaFbDBLy8QcGf24mXqkGuIgJ/XLvcKlUigl6qr1mzIGl1TIrue0Tipp4P bZziMZUL7oi2mghZUVl/jRT/DBMtdzM7/+Bt0EoazWXbmrcbRdyA39bYPj6e+ZIhZSS6 qdb7uW3LnMeZMjvxb+C4zm3guFx5Mk9EVJ81F+gx1Spp7IxEIAg43U5vl36JUvSAkfWI Zjcw== X-Gm-Message-State: AOAM532JDXLV2TL3DtN6ktMf/OpxHZ2f6BLg5tQF4ZV8k612bQqY/hMj ToRJLUz7YMbL++TI9sCXOCcvbKBqVTM= X-Google-Smtp-Source: ABdhPJz/2P6c3KoqMRNW2tMg7ZX+uxTZwb5r/U2+t/6IKMfoxbibdUQ4tZU/G1172F6G7/XYl/ImAA== X-Received: by 2002:a1c:2903:: with SMTP id p3mr943296wmp.170.1598824882885; Sun, 30 Aug 2020 15:01:22 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id q8sm8990017wrx.79.2020.08.30.15.01.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 30 Aug 2020 15:01:22 -0700 (PDT) Message-Id: <3a9b82839e47d974a1a37e77dd10a19daeed5d94.1598824880.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Philippe Blain via GitGitGadget" Date: Sun, 30 Aug 2020 22:01:18 +0000 Subject: [PATCH 1/3] git-imap-send.txt: don't duplicate 'Examples' sections Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Philippe Blain , Philippe Blain Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Philippe Blain Remove the 'Examples' subsection in the 'Configuration' section and move these examples to the 'Examples' section. Also remove the 'Variables' title since it is now useless. Also, use appropriate Asciidoc syntax for configuration values, and capitalize 'Gmail' properly. Suggested-by: Junio C Hamano Signed-off-by: Philippe Blain --- Documentation/git-imap-send.txt | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/Documentation/git-imap-send.txt b/Documentation/git-imap-send.txt index 65b53fcc47..0a00a1236b 100644 --- a/Documentation/git-imap-send.txt +++ b/Documentation/git-imap-send.txt @@ -51,17 +51,13 @@ OPTIONS CONFIGURATION ------------- -To use the tool, imap.folder and either imap.tunnel or imap.host must be set +To use the tool, `imap.folder` and either `imap.tunnel` or `imap.host` must be set to appropriate values. -Variables -~~~~~~~~~ - include::config/imap.txt[] -Examples -~~~~~~~~ - +EXAMPLES +-------- Using tunnel mode: .......................... @@ -93,10 +89,7 @@ Using direct mode with SSL: ......................... -EXAMPLES --------- -To submit patches using GMail's IMAP interface, first, edit your ~/.gitconfig -to specify your account settings: +Using Gmail's IMAP interface: --------- [imap] @@ -107,14 +100,14 @@ to specify your account settings: sslverify = false --------- -You might need to instead use: folder = "[Google Mail]/Drafts" if you get an error +You might need to instead use: `folder = "[Google Mail]/Drafts"` if you get an error that the "Folder doesn't exist". Once the commits are ready to be sent, run the following command: $ git format-patch --cover-letter -M --stdout origin/master | git imap-send -Just make sure to disable line wrapping in the email client (GMail's web +Just make sure to disable line wrapping in the email client (Gmail's web interface will wrap lines no matter what, so you need to use a real IMAP client). From patchwork Sun Aug 30 22:01:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kazuhiro Kato via GitGitGadget X-Patchwork-Id: 11745343 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 49764739 for ; Sun, 30 Aug 2020 22:01:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3161F2083E for ; Sun, 30 Aug 2020 22:01:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="SKC1tUY4" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726488AbgH3WBf (ORCPT ); Sun, 30 Aug 2020 18:01:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33704 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726468AbgH3WB1 (ORCPT ); Sun, 30 Aug 2020 18:01:27 -0400 Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com [IPv6:2a00:1450:4864:20::332]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 20B1EC061575 for ; Sun, 30 Aug 2020 15:01:26 -0700 (PDT) Received: by mail-wm1-x332.google.com with SMTP id o21so3654264wmc.0 for ; Sun, 30 Aug 2020 15:01:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=xB8JMQT9aJ467pUeoZlsE+oUMNqDYZqauwecT1xy7pM=; b=SKC1tUY4QqO6fBOja9389O/EECFqQsj7ejk0jKwdBOZoBvw2m1P7N9Img/1SuPWwlb IngNezahO8Cf0Q8pRZNDbtb1Ay0+gPAkxkyn7iMgWjv6i+mQC7bs/siG+Z7k5WM1fHoE EWfaM14E7dc12ohFPQ6zjGgGC1DMmGuc+wZqyLZRT8Besnxp2UkHEfc5r1zfH7hrwLth p0MQvl3TD+V02K79xgDIN5EsKnp4mp2SeC0FN12n1urGqOzy6UpIJIPZcy8YmT5CNWVw CXnGIfnslRII7otAHQCcbknw11yfSSYJ4v5hpPH66nNJts15dtLpZ3WP9oA0raaCGGUp qc+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=xB8JMQT9aJ467pUeoZlsE+oUMNqDYZqauwecT1xy7pM=; b=nM4YmqfMq9FMRLQalX+lyX2QcH6Fls1i0u1QKtaF8/ZtpeIvfWj9DBhJdKpz3v4yq2 EyuJ4XHIxbKS5LTJwXpo7kTirOy3JEKmYB2x8nzoRwnW0D1R+B9owWNQTxcKec6Oox8o jH/1cLhJeTtGAe4KCClOemU2Vl4jn2Yy082mxVmUrvQMbSeVVcovJ8F8taqfvJSsOXe4 XNP38WB0FfFb0qlQF4WjSAzVMfCftZ+xxtxBA0aO0zsr96j4ZvSNu30M/7AeP8GGsAod ucBEeYcaRm4ZoynjWvWmPyyVrEvU4/MXWaCmx910fzrt8VtG2cnqJsHbjU2et4pK1vzD dODA== X-Gm-Message-State: AOAM530crrByCDCWCD7V5s8zPrlfWhrykhqZyIu3K0/uOskTX/P0KFuS xfyC4MX6ydGRdmP8vhnpO0OATq3wqlk= X-Google-Smtp-Source: ABdhPJwwn+nu5db4Ilg/+nUQWrvzjbqZ6ZNoZS01UDzYs6GB/B14nLdjGA/7uXPngQOa8LcyV1aoiw== X-Received: by 2002:a1c:4b12:: with SMTP id y18mr8299776wma.0.1598824883761; Sun, 30 Aug 2020 15:01:23 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id k8sm9124773wrl.42.2020.08.30.15.01.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 30 Aug 2020 15:01:23 -0700 (PDT) Message-Id: In-Reply-To: References: From: "Philippe Blain via GitGitGadget" Date: Sun, 30 Aug 2020 22:01:19 +0000 Subject: [PATCH 2/3] git-imap-send.txt: do verify SSL certificate for gmail.com Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Philippe Blain , Philippe Blain Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Philippe Blain As a public service, it is unlikely that the Gmail server is configured to throw a certificate that does not verify at the user. Remove the `sslVerify=false` config from the Gmail example. Also, comment it in the `example.com` example, and add a note to the user explaining that they might want to uncomment it if they are having trouble connecting. While at it, use an Asciidoc 'Note' section in the Gmail example also. Based-on-patch-by: Barbu Paul - Gheorghe Helped-by: Junio C Hamano Signed-off-by: Philippe Blain --- Documentation/git-imap-send.txt | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Documentation/git-imap-send.txt b/Documentation/git-imap-send.txt index 0a00a1236b..5e4d4d43b9 100644 --- a/Documentation/git-imap-send.txt +++ b/Documentation/git-imap-send.txt @@ -85,10 +85,17 @@ Using direct mode with SSL: user = bob pass = p4ssw0rd port = 123 - sslverify = false + ; sslVerify = false ......................... +[NOTE] +You may want to use `sslVerify=false` +while troubleshooting, if you suspect that the reason you are +having trouble connecting is because the certificate you use at +the private server `example.com` you are trying to set up (or +have set up) may not be verified correctly. + Using Gmail's IMAP interface: --------- @@ -97,9 +104,9 @@ Using Gmail's IMAP interface: host = imaps://imap.gmail.com user = user@gmail.com port = 993 - sslverify = false --------- +[NOTE] You might need to instead use: `folder = "[Google Mail]/Drafts"` if you get an error that the "Folder doesn't exist". From patchwork Sun Aug 30 22:01:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kazuhiro Kato via GitGitGadget X-Patchwork-Id: 11745341 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3AC0B109B for ; Sun, 30 Aug 2020 22:01:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2359F2083E for ; Sun, 30 Aug 2020 22:01:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ZNqDOt35" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726479AbgH3WBf (ORCPT ); Sun, 30 Aug 2020 18:01:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33702 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726282AbgH3WB1 (ORCPT ); Sun, 30 Aug 2020 18:01:27 -0400 Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [IPv6:2a00:1450:4864:20::335]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2C0A6C061573 for ; Sun, 30 Aug 2020 15:01:26 -0700 (PDT) Received: by mail-wm1-x335.google.com with SMTP id o21so3654281wmc.0 for ; Sun, 30 Aug 2020 15:01:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=+sxQi5RyQbr1LaPzgrl6im4HbxTga52BZnZeYJEv+0A=; b=ZNqDOt35oup5/KXxeYr5zhNHhHaCxy3WTymnKbMSMkby5qkl2QE1IcwPO0L9GGKYxZ SZbNiCPpvYQcRIAiZ3LF6+8W5uSBZFRO4bGtXHUAggUFV1zBuByiY54Ib+1TFNqwmBwS REfILeHi6kPFauTB+kM0ZATvTZDCL8cTK7EzVsQKD/de0RFpUeIVzU2/vlI12kTGI9We NPYhm4TauEXURwOL3sM+G0PywqqbiIMR1oiM/AMMVRxzrawERCGRLFLGJOXHBQfZGWbW Cl6BKMAl7hAz6myhYsSOXTeE7eAeok3vqAqCqNc8wGkD73/Azi5oO4ZycrBzA7fdt7n/ 2/6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=+sxQi5RyQbr1LaPzgrl6im4HbxTga52BZnZeYJEv+0A=; b=oAkgyO+gr9HnJYK1SRJObByz2hjVoOQbJmu8QkXyiHv9amXmEyNwfZaPZkF/dIO+Ib ZPWViX2UFYmylsKs510AOeZ+xRAqnzhV0vHG01pl5UqI653CjAOd446NhgbXizva0YX7 3AE+2/wMc+3s4DAPklVsM1vHbxr90izEw95HOOtcGC8pRpt9SjjVWoa00nqjpFQcivOc g2uIq1YmUBOdaTrH0bqqy3w5anRiNytmAHmitab31vCxelt8/fqHsM8ktncbRG4xzswa /DwpPL+SVwhBgYKRezx2jLJ+7SY5OzwqHqskDMVeY7BKfLI9YDjObtunjrPFic1+83Jn +zug== X-Gm-Message-State: AOAM530REaeNzHpkirBpSbf1Pe3/AytdIyaQonn+xFELJiPYlj+/sxbK IVZSJbrkEnMn9tMMi4UHpH61CKbot1A= X-Google-Smtp-Source: ABdhPJws/sfda+RDigwZz01juOHk7enm1ixefcrBv8oLrnZsObloY5vmvdvaFnQEK9/BTyRq3zmc7Q== X-Received: by 2002:a7b:c848:: with SMTP id c8mr7185534wml.184.1598824884614; Sun, 30 Aug 2020 15:01:24 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id l1sm9398968wrb.12.2020.08.30.15.01.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 30 Aug 2020 15:01:24 -0700 (PDT) Message-Id: <2b12440045d926b194b90f16246d4f166f31442a.1598824880.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Philippe Blain via GitGitGadget" Date: Sun, 30 Aug 2020 22:01:20 +0000 Subject: [PATCH 3/3] git-imap-send.txt: add note about localized Gmail folders Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Philippe Blain , Philippe Blain Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Philippe Blain The name of the "Special-Use Mailboxes" in Gmail are localized using the user's localization settings. Add a note to that effect in `git imap-send`'s documentation, to make it easier for users to configure their account. Signed-off-by: Philippe Blain --- Documentation/git-imap-send.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Documentation/git-imap-send.txt b/Documentation/git-imap-send.txt index 5e4d4d43b9..63cf498ce9 100644 --- a/Documentation/git-imap-send.txt +++ b/Documentation/git-imap-send.txt @@ -110,6 +110,10 @@ Using Gmail's IMAP interface: You might need to instead use: `folder = "[Google Mail]/Drafts"` if you get an error that the "Folder doesn't exist". +[NOTE] +If your Gmail account is set to another language than English, the name of the "Drafts" +folder will be localized. + Once the commits are ready to be sent, run the following command: $ git format-patch --cover-letter -M --stdout origin/master | git imap-send