mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* maint:
  git-gui: Don't crash when starting gitk from a browser session
  git-gui: Allow gitk to be started on Cygwin with native Tcl/Tk

Conflicts:

	git-gui.sh
This commit is contained in:
Shawn O. Pearce
2007-10-03 00:17:19 -04:00
parent 0b2bc460fc 906ab7f6c0
commit e73bfa7709
1 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
git-gui.sh
View File

@ -1243,11 +1243,17 @@ proc mapdesc {state path} {
} }
proc ui_status {msg} { proc ui_status {msg} {
$::main_status show $msg global main_status
if {[info exists main_status]} {
$main_status show $msg
}
} }
proc ui_ready {{test {}}} { proc ui_ready {{test {}}} {
$::main_status show [mc "Ready."] $test global main_status
if {[info exists main_status]} {
$main_status show [mc "Ready."] $test
}
} }
proc escape_path {path} { proc escape_path {path} {
@ -1577,7 +1583,27 @@ proc do_gitk {revs} {
if {! [file exists $exe]} { if {! [file exists $exe]} {
error_popup [mc "Unable to start gitk:\n\n%s does not exist" $exe] error_popup [mc "Unable to start gitk:\n\n%s does not exist" $exe]
} else { } else {
global env
if {[info exists env(GIT_DIR)]} {
set old_GIT_DIR $env(GIT_DIR)
} else {
set old_GIT_DIR {}
}
set pwd [pwd]
cd [file dirname [gitdir]]
set env(GIT_DIR) [file tail [gitdir]]
eval exec $cmd $revs & eval exec $cmd $revs &
if {$old_GIT_DIR eq {}} {
unset env(GIT_DIR)
} else {
set env(GIT_DIR) $old_GIT_DIR
}
cd $pwd
ui_status $::starting_gitk_msg ui_status $::starting_gitk_msg
after 10000 { after 10000 {
ui_ready $starting_gitk_msg ui_ready $starting_gitk_msg