From: Shawn O. Pearce <spearce@spearce.org>
Date: Tue, 11 Sep 2007 22:57:26 +0000 (-0400)
Subject: Merge branch 'maint'
X-Git-Tag: gitgui-0.9.0~77
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=c8dd7f62e8b335681099cdcec2b01aeaad646813;p=git.git

Merge branch 'maint'

* maint:
  git-gui: Don't delete send on Windows as it doesn't exist
---

c8dd7f62e8b335681099cdcec2b01aeaad646813
diff --cc git-gui.sh
index 36ba849cc,e221d5b51..afee777f1
--- a/git-gui.sh
+++ b/git-gui.sh
@@@ -42,26 -42,8 +42,26 @@@ if {[catch {package require Tcl 8.4} er
  	exit 1
  }
  
- rename send {} ; # What an evil concept...
+ catch {rename send {}} ; # What an evil concept...
  
 +######################################################################
 +##
 +## locate our library
 +
 +set oguilib {@@GITGUI_LIBDIR@@}
 +set oguirel {@@GITGUI_RELATIVE@@}
 +if {$oguirel eq {1}} {
 +	set oguilib [file dirname [file dirname [file normalize $argv0]]]
 +	set oguilib [file join $oguilib share git-gui lib]
 +	set oguimsg [file join $oguilib msgs]
 +} elseif {[string match @@* $oguirel]} {
 +	set oguilib [file join [file dirname [file normalize $argv0]] lib]
 +	set oguimsg [file join [file dirname [file normalize $argv0]] po]
 +} else {
 +	set oguimsg [file join $oguilib msgs]
 +}
 +unset oguirel
 +
  ######################################################################
  ##
  ## enable verbose loading?