From: Shawn O. Pearce <spearce@spearce.org>
Date: Sun, 11 Feb 2007 22:19:38 +0000 (-0500)
Subject: git-gui: Stop deleting gitk preferences.
X-Git-Tag: gitgui-0.6.0~6
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=0960f7d6db89fa8418486cd088759e54dd51d54e;p=git.git

git-gui: Stop deleting gitk preferences.

Now that git 1.5.0 and later contains a version of gitk that uses
correct geometry on Windows platforms, even if ~/.gitk exists, we
should not delete the user's ~/.gitk to work around the bug.  It
is downright mean to remove a user's preferences for another app.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
---

diff --git a/git-gui.sh b/git-gui.sh
index f44e54909..ea16be43a 100755
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -4015,14 +4015,6 @@ set starting_gitk_msg {Starting gitk... please wait...}
 proc do_gitk {revs} {
 	global env ui_status_value starting_gitk_msg
 
-	# -- On Windows gitk is severly broken, and right now it seems like
-	#    nobody cares about fixing it.  The only known workaround is to
-	#    always delete ~/.gitk before starting the program.
-	#
-	if {[is_Windows]} {
-		catch {file delete [file join $env(HOME) .gitk]}
-	}
-
 	# -- Always start gitk through whatever we were loaded with.  This
 	#    lets us bypass using shell process on Windows systems.
 	#