diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-07-20 12:04:06 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-07-20 12:04:06 -0700 |
| commit | e7ae437ac19eb0e82739d82cc886221252689ff4 (patch) | |
| tree | baed7059dcb8ad2e61de4041debdbfeda85ec697 | |
| parent | Merge branch 'dl/branch-cleanup' into master (diff) | |
| parent | Merge branch 'mt/open-worktree' (diff) | |
| download | tgif-e7ae437ac19eb0e82739d82cc886221252689ff4.tar.xz | |
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
| -rw-r--r-- | git-gui/lib/choose_repository.tcl | 27 |
1 files changed, 3 insertions, 24 deletions
diff --git a/git-gui/lib/choose_repository.tcl b/git-gui/lib/choose_repository.tcl index e54f3e66d8..af1fee7c75 100644 --- 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} { |