git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Abhijit Menon-Sen <ams@toroid.org>
To: "Murphy, John" <john.murphy@bankofamerica.com>
Cc: git@vger.kernel.org
Subject: [PATCH] git-gui: Look for gitk in $PATH, not $LIBEXEC/git-core
Date: Thu, 24 Jul 2008 18:58:53 +0530	[thread overview]
Message-ID: <20080724132853.GA25313@toroid.org> (raw)
In-Reply-To: <80915B5E107BED488500050294C6F48712136B@ex2k.bankofamerica.com>

Signed-off-by: Abhijit Menon-Sen <ams@toroid.org>
---

At 2008-07-24 09:01:48 -0400, john.murphy@bankofamerica.com wrote:
>
> I presume this was just an oversight when git- commands were removed
> from the bin directory.

Looks like it. The following patch fixes it for me. Does it work for
you on Windows?

-- ams

 git-gui/git-gui.sh |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh
index 940677c..a70fa67 100755
--- a/git-gui/git-gui.sh
+++ b/git-gui/git-gui.sh
@@ -1670,10 +1670,10 @@ proc do_gitk {revs} {
 	# -- Always start gitk through whatever we were loaded with.  This
 	#    lets us bypass using shell process on Windows systems.
 	#
-	set exe [file join [file dirname $::_git] gitk]
+	set exe [_which gitk]
 	set cmd [list [info nameofexecutable] $exe]
-	if {! [file exists $exe]} {
-		error_popup [mc "Unable to start gitk:\n\n%s does not exist" $exe]
+	if {$exe eq {}} {
+		error_popup [mc "Couldn't find gitk in PATH"]
 	} else {
 		global env
 
-- 
1.5.6.GIT

  reply	other threads:[~2008-07-24 13:29 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-07-24 13:01 Git Gui bug calling gitk Murphy, John
2008-07-24 13:28 ` Abhijit Menon-Sen [this message]
2008-07-25 22:05   ` [PATCH] git-gui: Look for gitk in $PATH, not $LIBEXEC/git-core Shawn O. Pearce
2008-07-29 12:40     ` Murphy, John
2008-07-29 16:48       ` Shawn O. Pearce
2008-07-30  5:42         ` Shawn O. Pearce

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20080724132853.GA25313@toroid.org \
    --to=ams@toroid.org \
    --cc=git@vger.kernel.org \
    --cc=john.murphy@bankofamerica.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.
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 NNTP newsgroup(s).