git-gui: fix inability to quit after closing another instance

orgads · orgads · commit f402c7941f19 · 2024-06-30T09:15:04.000+03:00
If you open 2 git gui instances in the same directory, then close one
of them and try to close the other, an error message pops up, saying:
'error renaming ".git/GITGUI_BCK": no such file or directory', and it
is no longer possible to close the window ever.

Fix by catching this error, and proceeding even if the file no longer
exists.

Signed-off-by: Orgad Shaneh &lt;orgads@gmail.com&gt;
diff --git a/git-gui.sh b/git-gui.sh
@@ -2301,7 +2301,7 @@ proc do_quit {{rc {1}}} {
 		#
 		set save [gitdir GITGUI_MSG]
 		if {$GITGUI_BCK_exists && ![$ui_comm edit modified]} {
-			file rename -force [gitdir GITGUI_BCK] $save
+			catch { file rename -force [gitdir GITGUI_BCK] $save }
 			set GITGUI_BCK_exists 0
 		} elseif {[$ui_comm edit modified]} {
 			set msg [string trim [$ui_comm get 0.0 end]]

Original file line number	Diff line number	Diff line change
`@@ -2301,7 +2301,7 @@ proc do_quit {{rc {1}}} {`
`2301`	`2301`	`#`
`2302`	`2302`	`set save [gitdir GITGUI_MSG]`
`2303`	`2303`	`if {$GITGUI_BCK_exists && ![$ui_comm edit modified]} {`
`2304`		`- file rename -force [gitdir GITGUI_BCK] $save`
	`2304`	`+ catch { file rename -force [gitdir GITGUI_BCK] $save }`
`2305`	`2305`	`set GITGUI_BCK_exists 0`
`2306`	`2306`	`} elseif {[$ui_comm edit modified]} {`
`2307`	`2307`	`set msg [string trim [$ui_comm get 0.0 end]]`