git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Sebastian Schuberth <sschuberth@gmail.com>
Cc: git@vger.kernel.org, Pat Thoyts <patthoyts@users.sourceforge.net>
Subject: Re: [PATCH v2] git-gui--askpass: generalize the wording
Date: Thu, 27 Apr 2017 16:02:10 +0200 (CEST)	[thread overview]
Message-ID: <alpine.DEB.2.20.1704271601440.3480@virtualbox> (raw)
In-Reply-To: <f318a3ab-930f-fa58-db3d-d28998371a86@gmail.com>

+ 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 <sschuberth@gmail.com>
> > ---
> >   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
> 
> 
> 

      reply	other threads:[~2017-04-27 14:02 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-02-01 12:11 [PATCH] git-gui--askpass: generalize the window title Sebastian Schuberth
2016-02-12  9:26 ` Sebastian Schuberth
2017-03-07 15:48 ` [RESEND PATCH] " Sebastian Schuberth
2017-03-07 18:30   ` Stefan Beller
2017-03-07 18:40     ` Sebastian Schuberth
2017-04-27  6:38   ` [PATCH v2] git-gui--askpass: generalize the wording Sebastian Schuberth
2017-04-27  9:19     ` Sebastian Schuberth
2017-04-27 14:02       ` Johannes Schindelin [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=alpine.DEB.2.20.1704271601440.3480@virtualbox \
    --to=johannes.schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=patthoyts@users.sourceforge.net \
    --cc=sschuberth@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).