diff options
| author |  Remi Rampin <remirampin@gmail.com> | 2015-03-06 11:21:53 -0500 |
|---|---|---|
| committer |  Pat Thoyts <patthoyts@users.sourceforge.net> | 2015-03-07 12:29:03 +0000 |
| commit | 83da013998a93bf3413eae4bf8d6aca01550188b (patch) | |
| tree | 6f3f9fd1b1d8eaf1e43b99e5745d8aa1f060fb2e | |
| parent | git-gui: Fixes chooser not accepting gitfiles (diff) | |
| download | tgif-83da013998a93bf3413eae4bf8d6aca01550188b.tar.xz | |
git-gui: Makes chooser set 'gitdir' to the resolved path
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>
| -rw-r--r-- | lib/choose_repository.tcl | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/lib/choose_repository.tcl b/lib/choose_repository.tcl index abc6b1dbcb..75d1da8d31 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 } |