git-gui: Use PWD if it exists on Mac OS X
authorMarcus Karlsson <mk@acc.umu.se>
Fri, 9 Mar 2012 23:17:22 +0000 (00:17 +0100)
committerPat Thoyts <patthoyts@users.sourceforge.net>
Sat, 10 Mar 2012 23:16:24 +0000 (23:16 +0000)
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 <mk@acc.umu.se>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
macosx/AppMain.tcl
index ddbe6334a258dae46b6c333d53590f3b920a9cab..738bdd03ed8a3940ae9bec362ddcfd16a3c48e9c 100644 (file)
@@ -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)
        }
 }