git-gui: Treat `git version` as `git --version`

diff --git a/git-gui.sh b/git-gui.sh
index 09f49ce0208c891ee7168842ebed3f1158a3867b..a3ac5daf14c3e57229d3d1dbea5bdee3c368fdb5 100755 (executable)
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -294,6 +294,7 @@ proc _git_cmd {name} {
 
        if {[catch {set v $_git_cmd_path($name)}]} {
                switch -- $name {
+                 version   -
                --version   -
                --exec-path { return [list $::_git $name] }
                }
@@ -315,7 +316,10 @@ proc _git_cmd {name} {
                        #
                        set v [list $::_sh [gitexec git-$name]]
                } else {
-                       error "No [gitexec git-$name]"
+                       # Assume it is builtin to git somehow and we
+                       # aren't actually able to see a file for it.
+                       #
+                       set v [list $::_git $name]
                }
                set _git_cmd_path($name) $v
        }
@@ -1303,24 +1307,16 @@ proc incr_font_size {font {amt 1}} {
 set starting_gitk_msg {Starting gitk... please wait...}
 
 proc do_gitk {revs} {
-       global env starting_gitk_msg
-
        # -- Always start gitk through whatever we were loaded with.  This
        #    lets us bypass using shell process on Windows systems.
        #
-       set cmd [list [info nameofexecutable]]
-       set exe [gitexec gitk]
-       lappend cmd $exe
-       if {$revs ne {}} {
-               append cmd { }
-               append cmd $revs
-       }
-
+       set exe [file join [file dirname $::_git] gitk]
+       set cmd [list [info nameofexecutable] $exe]
        if {! [file exists $exe]} {
                error_popup "Unable to start gitk:\n\n$exe does not exist"
        } else {
-               eval exec $cmd &
-               ui_status $starting_gitk_msg
+               eval exec $cmd $revs &
+               ui_status $::starting_gitk_msg
                after 10000 {
                        ui_ready $starting_gitk_msg
                }