From: Pat Thoyts <patthoyts@users.sourceforge.net>
Date: Tue, 15 Sep 2009 09:26:30 +0000 (+0100)
Subject: gitk: Work around leftover temporary save file
X-Git-Tag: v1.6.5-rc2~9^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=9bedb0e185332f9f8fb5e1c18bb5aff9964145a6;p=git.git

gitk: Work around leftover temporary save file

If a file exists and is hidden on Windows the Tcl open command will
fail as the attributes provided in the CREAT call fail to match those
of the existing file.  Forcing removal of the temporary file before we
begin solves any problems caused by previous failures to save the
application settings.  An alternative would be to remove the hidden
attribute before calling 'open'.

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
Signed-off-by: Paul Mackerras <paulus@samba.org>
---

diff --git a/gitk b/gitk
index 130617806..a0214b700 100755
--- a/gitk
+++ b/gitk
@@ -2526,6 +2526,7 @@ proc savestuff {w} {
     if {$stuffsaved} return
     if {![winfo viewable .]} return
     catch {
+	if {[file exists ~/.gitk-new]} {file delete -force ~/.gitk-new}
 	set f [open "~/.gitk-new" w]
 	if {$::tcl_platform(platform) eq {windows}} {
 	    file attributes "~/.gitk-new" -hidden true