From: Pratyush Yadav <me@yadavpratyush.com>
To: Mikhail Terekhov via GitGitGadget <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, Mikhail Terekhov <termim@gmail.com>,
Eric Sunshine <sunshine@sunshineco.com>
Subject: Re: [PATCH v2] git-gui: allow opening work trees from the startup dialog
Date: Mon, 8 Jun 2020 15:01:18 +0530 [thread overview]
Message-ID: <20200608093118.ppwpydlkd5bmsjh5@yadavpratyush.com> (raw)
In-Reply-To: <pull.644.v2.git.1591418019023.gitgitgadget@gmail.com>
+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/79089e52643ce1ba7d8494f32b2fb1891c926079
--
Regards,
Pratyush Yadav
next prev parent reply other threads:[~2020-06-08 9:31 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-26 15:33 [PATCH] git-gui: allow opening work trees from the startup dialog Mikhail Terekhov via GitGitGadget
2020-06-05 20:48 ` Pratyush Yadav
2020-06-05 21:13 ` Eric Sunshine
2020-06-06 4:33 ` [PATCH v2] " Mikhail Terekhov via GitGitGadget
2020-06-08 9:31 ` Pratyush Yadav [this message]
2020-06-22 14:58 ` Pratyush Yadav
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200608093118.ppwpydlkd5bmsjh5@yadavpratyush.com \
--to=me@yadavpratyush.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=sunshine@sunshineco.com \
--cc=termim@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).