git-gui: Only touch GITGUI_MSG when needed

In 4e55d19 (git-gui: Cleanup end-of-line whitespace in commit messages., 2007-01-25), the logic to decide if GITGUI_MSG should be saved or deleted was updated to not require the commit message buffer to be modified. This fixes a situation where if the user quits and restarts git-gui multiple times the commit message buffer was lost. Unfortunately, the fix was not quite correct. The check for whether the commit message buffer has been modified is useless. If the commit is _not_ amend, then the check is never performed. If the commit is amend, then saving the message does not matter anyway. Amend state is destroyed on exit and the next time git-gui is opened it starts from scratch, but with the older message retained in the buffer. If amend is selected, the current message is over-written by the amend commit's message. The correct fix would be to not touch GITGUI_MSG at all if the commit message buffer is not modified. This way, the file is not deleted even on multiple restarts. It has the added benefit of not writing the file unnecessarily on every exit. Signed-off-by: Pratyush Yadav <me@yadavpratyush.com>

Pratyush Yadav committed Nov 27, 2020 at 15:53 UTC ce83ab2bd3751eadb0eb6f12d1e9d984613a4cc2
1 file changed +2 -3
git-gui.sh
+2 -3
@@ -2305,11 +2305,10 @@ proc do_quit {{rc {1}}} {
2305 if {$GITGUI_BCK_exists && ![$ui_comm edit modified]} {
2306 file rename -force [gitdir GITGUI_BCK] $save
2307 set GITGUI_BCK_exists 0
2308 - } else {
2308 + } elseif {[$ui_comm edit modified]} {
2309 set msg [string trim [$ui_comm get 0.0 end]]
2310 regsub -all -line {[ \r\t]+$} $msg {} msg
2311 - if {(![string match amend* $commit_type]
2312 - || [$ui_comm edit modified])
2311 + if {![string match amend* $commit_type]
2312 && $msg ne {}} {
2313 catch {
2314 set fd [open $save w]