rhodecode-vcsserver Files · pkgs/patches/git/ssh-path.patch

release: Merge default into stable for release preparation

marcink - - Load All Authors

File last commit:

r724:60c231be default


                r887:3120a169

stable

Download file

             ssh-path.patch
        
                    26 lines
            
             | 801 B
            
                | text/x-diff
            
             |
                DiffLexer
            
             / pkgs / patches / git / ssh-path.patch
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      diff --git a/connect.c b/connect.c

      index 4813f005ab..b3f12f3268 100644

      --- a/connect.c

      +++ b/connect.c

      @@ -1183,7 +1183,7 @@ static void fill_ssh_args(struct child_process *conn, const char *ssh_host,

       		ssh = getenv("GIT_SSH");

       		if (!ssh)

      -			ssh = "ssh";

      +			ssh = "@ssh@";

       		variant = determine_ssh_variant(ssh, 0);

       	}

      diff --git a/git-gui/lib/remote_add.tcl b/git-gui/lib/remote_add.tcl

      index 480a6b30d0..7817204241 100644

      --- a/git-gui/lib/remote_add.tcl

      +++ b/git-gui/lib/remote_add.tcl

      @@ -139,7 +139,7 @@ method _add {} {

       		# Parse the location

       		if { [regexp {(?:git\+)?ssh://([^/]+)(/.+)} $location xx host path]

       		     || [regexp {([^:][^:]+):(.+)} $location xx host path]} {

      -			set ssh ssh

      +			set ssh @ssh@

       			if {[info exists env(GIT_SSH)]} {

       				set ssh $env(GIT_SSH)

       			}

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				diff --git a/connect.c b/connect.c
				index 4813f005ab..b3f12f3268 100644
				--- a/connect.c
				+++ b/connect.c
				@@ -1183,7 +1183,7 @@ static void fill_ssh_args(struct child_process conn, const char ssh_host,

				ssh = getenv("GIT_SSH");
				if (!ssh)
				- ssh = "ssh";
				+ ssh = "@ssh@";
				variant = determine_ssh_variant(ssh, 0);
				}

				diff --git a/git-gui/lib/remote_add.tcl b/git-gui/lib/remote_add.tcl
				index 480a6b30d0..7817204241 100644
				--- a/git-gui/lib/remote_add.tcl
				+++ b/git-gui/lib/remote_add.tcl
				@@ -139,7 +139,7 @@ method _add {} {
				# Parse the location
				if { [regexp {(?:git\+)?ssh://([^/]+)(/.+)} $location xx host path]
				\|\| [regexp {([^:][^:]+):(.+)} $location xx host path]} {
				- set ssh ssh
				+ set ssh @ssh@
				if {[info exists env(GIT_SSH)]} {
				set ssh $env(GIT_SSH)
				}