mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-23 09:49:23 +02:00
Code

git-gui: Makes chooser set 'gitdir' to the resolved path

Browse Source 
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: Chris Packham <judge.packham@gmail.com>
Signed-off-by: Remi Rampin <remirampin@gmail.com>
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
This commit is contained in:
Remi Rampin 2015-03-06 11:21:53 -05:00 committed by Pat Thoyts
parent cc6825e194
commit 83da013998
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/choose_repository.tcl
View File

@ -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
}