Merge https://github.com/prati0100/git-gui into master

* https://github.com/prati0100/git-gui:
  git-gui: allow opening work trees from the startup dialog

diff --git a/git-gui/lib/choose_repository.tcl b/git-gui/lib/choose_repository.tcl
index e54f3e66d8f07267f88d2286dd9f79195214fef2..af1fee7c751dc635bcc9c621161dc3558f297cb8 100644 (file)
--- a/git-gui/lib/choose_repository.tcl
+++ b/git-gui/lib/choose_repository.tcl
@@ -357,31 +357,10 @@ 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
-               close $fp
-               if {[regexp "^gitdir: (.+)$" $line line link_target]} {
-                       set path [file join [file dirname $path] $link_target]
-                       set path [file normalize $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
-               }
+       if {[catch {set outdir [git rev-parse --resolve-git-dir $path]}]} {
+               return 0
        }
-       return 0
+       return 1
 }
 
 proc _objdir {path} {