From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-3.1 required=3.0 tests=AWL,BAYES_00, FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 0BBA5207D6 for ; Thu, 27 Apr 2017 14:02:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S937942AbdD0OCe (ORCPT ); Thu, 27 Apr 2017 10:02:34 -0400 Received: from mout.gmx.net ([212.227.17.21]:64604 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S937121AbdD0OCd (ORCPT ); Thu, 27 Apr 2017 10:02:33 -0400 Received: from virtualbox ([37.201.193.73]) by mail.gmx.com (mrgmx103 [212.227.17.168]) with ESMTPSA (Nemesis) id 0MZD0K-1dOZAS0KjM-00Kx0H; Thu, 27 Apr 2017 16:02:16 +0200 Date: Thu, 27 Apr 2017 16:02:10 +0200 (CEST) From: Johannes Schindelin X-X-Sender: virtualbox@virtualbox To: Sebastian Schuberth cc: git@vger.kernel.org, Pat Thoyts Subject: Re: [PATCH v2] git-gui--askpass: generalize the wording In-Reply-To: Message-ID: References: <0102015aa974d7a6-46afa73b-4378-4b01-9db4-723fb9e41d65-000000@eu-west-1.amazonses.com> <0102015bae2176a2-8239cc7d-6510-4903-856b-e4fb0ef0cc71-000000@eu-west-1.amazonses.com> User-Agent: Alpine 2.20 (DEB 67 2015-01-07) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII X-Provags-ID: V03:K0:VMDpR/a51/ZCemHpU5ROhAlCWrPp20XRPSEH/OBlRm97Ak0fJiB yW9KA3CttfBE3DhzoPiJV2lh+bW9teMG9LR1jgrs+rtj8wfexVENrsv2gF6iTSnnMcv0brQ V06a0b81QrgF9vZ8nEIapum53tSpkCTGrQsu6UQYVLzEoUPdYg2Wc3kICx6/ovLrIdgyRCV e13nuGV0BO/i2FjubfmRw== X-UI-Out-Filterresults: notjunk:1;V01:K0:6QmH4lUFFgY=:DA1ZZGkG+FMmSPAU1QonbU IRh0/LtD2IAyML0XKrNV+JgtYKqlkGhDIK2PJhq7Q9iPFNqcG95M22eAf8fygFnzr+77I1VT5 4+8lcUmPUJNbRQNuqTFtLBcf3cJiFvILBTigkBqA102//WIrJqp0xC6a7MrxjeCvldfhnOh8r fISoMKgcxARQKHFQV1mRlrbdZOYSpCgsuvnCYyIqP8uWXf0p5t/lQvUXkQrpoAOc+mhu/9Usz EL2+AOHRzyk1zmoTStLfUAhOIEDL1RGD5hpJJuC2qGj/eCHYQPc0sLc9+xoMkbW0zlOnmyxKD SxVAacTIsRQf8See1qLmZAASerwBzO+fspKd3rS88KugabQBS598AGzOx4zX7ya5mxQ/Xpg7b Fgdey7UVIIwHZBipQZ2/YQ9mylRI8om5ZPVW0bqKXYIRBwkVVqw+S6MKIt6B/Skwqjj6mDMlG fXzWr1DpJiwI/JT5raoqunndlcDXjDy4Af8doKxn6T4iYb0hhVoKS0FHr861SGlGdQwXFg/Qt s5f3TbMjPxhr/KJnLrNN84M1iUej7xcBMYliWep4Fh958JNhFAYWM3etDv4gbOQ1ByDj6hDOs JIXIvG36SRO2OBOwLe5dsE/BfSLgH944c5AdULWQG3JiiJ5h0Zb3cZV/S+28RkmpsN/k4+VJS tBq97Iv5zg3/XZYFNv36iwsEZeG/pQ7xtRV1YbBfapn4f4O4zshDoKKsfI5LBBKb0na6HK30F EZqXJqlhUZx35CVUTBJt0iHIlHAvAgZDk1nzRF1pdy3DyB0lvc0m2wgz2Xc+91tZVPQ8LlRAv z+C7Fxs Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org + Pat On Thu, 27 Apr 2017, Sebastian Schuberth wrote: > + Pat > > On 2017-04-27 08:38, Sebastian Schuberth wrote: > > > git-gui--askpass is not only used for SSH authentication, but also for > > HTTPS. In that context it is confusing to only rfer to "OpenSSH", also > > because another SSH client like PuTTY might be in use. So generalize > > wording and also say which parent process, i.e. Git, requires > > authentication. > > > > Signed-off-by: Sebastian Schuberth > > --- > > git-gui/git-gui--askpass | 6 +++--- > > 1 file changed, 3 insertions(+), 3 deletions(-) > > > > diff --git a/git-gui/git-gui--askpass b/git-gui/git-gui--askpass > > index 4277f30..4e3f00d 100755 > > --- a/git-gui/git-gui--askpass > > +++ b/git-gui/git-gui--askpass > > @@ -2,7 +2,7 @@ > > # Tcl ignores the next line -*- tcl -*- \ > > exec wish "$0" -- "$@" > > > > -# This is a trivial implementation of an SSH_ASKPASS handler. > > +# This is a trivial implementation of an GIT_ASKPASS / SSH_ASKPASS handler. > > # Git-gui uses this script if none are already configured. > > > > package require Tk > > @@ -12,7 +12,7 @@ set yesno 0 > > set rc 255 > > > > if {$argc < 1} { > > - set prompt "Enter your OpenSSH passphrase:" > > + set prompt "Enter your password / passphrase:" > > } else { > > set prompt [join $argv " "] > > if {[regexp -nocase {\(yes\/no\)\?\s*$} $prompt]} { > > @@ -60,7 +60,7 @@ proc finish {} { > > set ::rc 0 > > } > > > > -wm title . "OpenSSH" > > +wm title . "Git Authentication" > > tk::PlaceWindow . > > vwait rc > > exit $rc > > > > > -- > Sebastian Schuberth > > >