diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2007-07-03 10:42:43 -0400 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-07-03 10:42:43 -0400 |
| commit | f10c1c77430e57a9d506848a34758ee93a77b8b5 (patch) | |
| tree | 5d54ee2bfc84b9b36aa5ae90bf37c40e6a0af456 | |
| parent | 03d25622a5c0f8d0fc4030f3114974d86f20fd61 (diff) | |
| parent | 7aecb128779ffd8258f01f4382df963900ae6acd (diff) | |
| download | git-f10c1c77430e57a9d506848a34758ee93a77b8b5.tar.gz git-f10c1c77430e57a9d506848a34758ee93a77b8b5.tar.xz | |
Merge branch 'maint'
* maint:
git-gui: properly popup error if gitk should be started but is not installed
| -rwxr-xr-x | git-gui.sh | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/git-gui.sh b/git-gui.sh index 9df2e4702..8ee680221 100755 --- a/git-gui.sh +++ b/git-gui.sh @@ -1065,15 +1065,17 @@ proc do_gitk {revs} { # lets us bypass using shell process on Windows systems. # set cmd [list [info nameofexecutable]] - lappend cmd [gitexec gitk] + set exe [gitexec gitk] + lappend cmd $exe if {$revs ne {}} { append cmd { } append cmd $revs } - if {[catch {eval exec $cmd &} err]} { - error_popup "Failed to start gitk:\n\n$err" + if {! [file exists $exe]} { + error_popup "Unable to start gitk:\n\n$exe does not exist" } else { + eval exec $cmd & set ui_status_value $starting_gitk_msg after 10000 { if {$ui_status_value eq $starting_gitk_msg} { |