Re: [PATCH v2] git-gui--askpass: generalize the wording

[Johannes Schindelin]

+ 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
> 
> 
> 

Re: [PATCH v2] git-gui--askpass: generalize the wording

[Sebastian Schuberth]

+ 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

[PATCH v2] git-gui--askpass: generalize the wording

[Sebastian Schuberth]

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

--
https://github.com/git/git/pull/195