From 446f8226ddb4f1d6e5ce14fb8cc22695af08e32b Mon Sep 17 00:00:00 2001 From: Marcus Karlsson Date: Sat, 10 Mar 2012 00:17:22 +0100 Subject: git-gui: Use PWD if it exists on Mac OS X The current working directory is set to / when git-gui is invoked using the Git Gui.app bundle on Mac OS X. This means that if it is launched from a directory which contains a repository then git-gui won't automatically find it unless the repository happens to be located in /. The PWD environment variable is however preserved if the bundle is invoked using open(1). If git-gui would check for PWD then a user could for example type open -a 'Git Gui' on a command line in order to launch the program and it would automatically find the repository. Teach git-gui to use the PWD environment variable on Mac OS X. Signed-off-by: Marcus Karlsson Signed-off-by: Junio C Hamano Signed-off-by: Pat Thoyts --- macosx/AppMain.tcl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/macosx/AppMain.tcl b/macosx/AppMain.tcl index ddbe6334a2..738bdd03ed 100644 --- a/macosx/AppMain.tcl +++ b/macosx/AppMain.tcl @@ -12,7 +12,9 @@ if {[file tail [lindex $argv 0]] eq {gitk}} { } else { set argv0 [file join $gitexecdir [file tail [lindex $argv 0]]] set AppMain_source [file join $gitguilib git-gui.tcl] - if {[pwd] eq {/}} { + if {[info exists env(PWD)]} { + cd $env(PWD) + } elseif {[pwd] eq {/}} { cd $env(HOME) } } -- cgit v1.2.3