diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-07-07 22:50:37 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-07-07 22:50:59 -0700 |
| commit | 5c9be4c9d6cfe32a77782116f6b66940fa19c86b (patch) | |
| tree | 5edfbcae1b66807fafdda7376fc8b8d203a497ee /git-gui/git-gui.sh | |
| parent | 06e570c0dfb2a2deb64d217db78e2ec21672f558 (diff) | |
| parent | 2864e855932540c3ec6c9bf41ee3fe027d85f642 (diff) | |
Merge https://github.com/j6t/git-gui
* https://github.com/j6t/git-gui:
git-gui: fix inability to quit after closing another instance
git-gui: sv.po: Update Swedish translation (576t0f0u)
git-gui: note the new maintainer
Makefile(s): do not enforce "all indents must be done with tab"
Makefile(s): avoid recipe prefix in conditional statements
doc: switch links to https
doc: update links to current pages
git-gui: po: fix typo in French "aperçu"
Diffstat (limited to 'git-gui/git-gui.sh')
| -rwxr-xr-x | git-gui/git-gui.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh index 507fb2b682..8fe7538e72 100755 --- a/git-gui/git-gui.sh +++ b/git-gui/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]] |