Re: [PATCH v2] git-gui: allow opening work trees from the startup dialog
On 08/06/20 03:01PM, Pratyush Yadav wrote:
Show 54 quoted lines
> +Cc Eric.
>
> On 06/06/20 04:33AM, Mikhail Terekhov via GitGitGadget wrote:
> > From: Mikhail Terekhov <termim@gmail.com>
> >
> > In proc _is_git check that supplied path is a valid work tree path.
> > This allows the choose_repository::pick dialog to accept path to a
> > work tree directory.
> >
> > Signed-off-by: Mikhail Terekhov <termim@gmail.com>
> > ---
> > lib/choose_repository.tcl | 29 +++++------------------------
> > 1 file changed, 5 insertions(+), 24 deletions(-)
> >
> > diff --git a/lib/choose_repository.tcl b/lib/choose_repository.tcl
> > index e54f3e66d8f..07f29b0b13b 100644
> > --- a/lib/choose_repository.tcl
> > +++ b/lib/choose_repository.tcl
> > @@ -357,31 +357,12 @@ 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
>
> I fixed trailing whitespace in a couple lines and a small style nitpick. You
> can check them here [0]. Will merge. Thanks both.
>
> [0] https://github.com/prati0100/git-gui/commit/79089e52643ce1ba7d8494f32b2fb1891c926079Merged to git-gui/master.
--
Regards,
Pratyush Yadav