git-gui: suppress RenderBadPicture X error caused by Tk bug

Due to a bug in Tk, git-gui almost always (unless git-gui is closed right after starting) produces an X window error message on exit, something like: X Error of failed request: RenderBadPicture (invalid Picture parameter) Major opcode of failed request: 150 (RENDER) Minor opcode of failed request: 7 (RenderFreePicture) Picture id in failed request: 0x3a000dc Serial number of failed request: 1965 Current serial number in output stream: 1980 Respective Tk bug report is here: http://sourceforge.net/tracker/?func=detail&atid=112997&aid=1821174&group_id=12997 This bug is triggered only when the send command is blocked via rename send {} . The following patch re-enables send just before quiting git-gui to suppress the error. Signed-off-by: Jindrich Makovicka <makovick@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

Jindrich Makovicka committed Dec 4, 2009 at 10:28 UTC 60204ddb99187dd329000864a618e57742372d74

1 file changed +5

git-gui.sh

@@ -2052,6 +2052,11 @@ proc do_quit {{rc {1}}} {

2052 }

2053

2054 set ret_code $rc

2055 +

2056 + # Briefly enable send again, working around Tk bug

2057 + # http://sourceforge.net/tracker/?func=detail&atid=112997&aid=1821174&group_id=12997

2058 + tk appname [appname]

2059 +

2060 destroy .

2061 }

2062