[PATCH 2/2] Makes chooser set 'gitdir' to the resolved path

2015-03-06 Thread Remi Rampin 
If _is_git follows a "gitdir: ..." file link to get to the actual
repository, we want _gitdir to be set to that final path.

Signed-off-by: Remi Rampin 
---
 lib/choose_repository.tcl | 11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/lib/choose_repository.tcl b/lib/choose_repository.tcl
index abc6b1d..75d1da8 100644
--- a/lib/choose_repository.tcl
+++ b/lib/choose_repository.tcl
@@ -338,7 +338,10 @@ method _git_init {} {
return 1
 }
 
-proc _is_git {path} {
+proc _is_git {path {outdir_var ""}} {
+   if {$outdir_var ne ""} {
+   upvar 1 $outdir_var outdir
+   }
if {[file isfile $path]} {
set fp [open $path r]
gets $fp line
@@ -352,12 +355,14 @@ proc _is_git {path} {
if {[file exists [file join $path HEAD]]
 && [file exists [file join $path objects]]
 && [file exists [file join $path config]]} {
+   set outdir $path
return 1
}
if {[is_Cygwin]} {
if {[file exists [file join $path HEAD]]
 && [file exists [file join $path objects.lnk]]
 && [file exists [file join $path config.lnk]]} {
+   set outdir $path
return 1
}
}
@@ -1103,7 +1108,7 @@ method _open_local_path {} {
 }
 
 method _do_open2 {} {
-   if {![_is_git [file join $local_path .git]]} {
+   if {![_is_git [file join $local_path .git] actualgit]} {
error_popup [mc "Not a Git repository: %s" [file tail 
$local_path]]
return
}
@@ -1116,7 +1121,7 @@ method _do_open2 {} {
}
 
_append_recentrepos [pwd]
-   set ::_gitdir .git
+   set ::_gitdir $actualgit
set ::_prefix {}
set done 1
 }
-- 
1.9.5.msysgit.0

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 2/2] Makes chooser set 'gitdir' to the resolved path

2015-02-05 Thread Remi Rampin 
If _is_git follows a "gitdir: ..." file link to get to the actual
repository, we want _gitdir to be set to that final path.
---
 lib/choose_repository.tcl | 11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/lib/choose_repository.tcl b/lib/choose_repository.tcl
index abc6b1d..75d1da8 100644
--- a/lib/choose_repository.tcl
+++ b/lib/choose_repository.tcl
@@ -338,7 +338,10 @@ method _git_init {} {
return 1
 }
 
-proc _is_git {path} {
+proc _is_git {path {outdir_var ""}} {
+   if {$outdir_var ne ""} {
+   upvar 1 $outdir_var outdir
+   }
if {[file isfile $path]} {
set fp [open $path r]
gets $fp line
@@ -352,12 +355,14 @@ proc _is_git {path} {
if {[file exists [file join $path HEAD]]
 && [file exists [file join $path objects]]
 && [file exists [file join $path config]]} {
+   set outdir $path
return 1
}
if {[is_Cygwin]} {
if {[file exists [file join $path HEAD]]
 && [file exists [file join $path objects.lnk]]
 && [file exists [file join $path config.lnk]]} {
+   set outdir $path
return 1
}
}
@@ -1103,7 +1108,7 @@ method _open_local_path {} {
 }
 
 method _do_open2 {} {
-   if {![_is_git [file join $local_path .git]]} {
+   if {![_is_git [file join $local_path .git] actualgit]} {
error_popup [mc "Not a Git repository: %s" [file tail 
$local_path]]
return
}
@@ -1116,7 +1121,7 @@ method _do_open2 {} {
}
 
_append_recentrepos [pwd]
-   set ::_gitdir .git
+   set ::_gitdir $actualgit
set ::_prefix {}
set done 1
 }
-- 
1.9.5.msysgit.0

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html