kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

git-gui: Don't save amended commit message buffer. 

Because we don't automatically restart in amend mode when we quit while
in amend mode the commit message buffer shouldn't be saved to GITGUI_MSG
as it would be misleading when the user restarts the application.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
maint
Shawn O. Pearce 2006-11-20 21:59:19 -05:00
parent 444f92d097
commit 21d7744fbc
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
git-gui
View File

@ -297,8 +297,8 @@ proc rescan {after} {
} elseif {[load_message MERGE_MSG]} { } elseif {[load_message MERGE_MSG]} {
} elseif {[load_message SQUASH_MSG]} { } elseif {[load_message SQUASH_MSG]} {
} }
$ui_comm edit modified false
$ui_comm edit reset $ui_comm edit reset
$ui_comm edit modified false
} }


if {$repo_config(gui.trustmtime) eq {true}} { if {$repo_config(gui.trustmtime) eq {true}} {
@ -750,8 +750,8 @@ current merge activity.


$ui_comm delete 0.0 end $ui_comm delete 0.0 end
$ui_comm insert end $msg $ui_comm insert end $msg
$ui_comm edit modified false
$ui_comm edit reset $ui_comm edit reset
$ui_comm edit modified false
rescan {set ui_status_value {Ready.}} rescan {set ui_status_value {Ready.}}
} }


@ -760,8 +760,8 @@ proc create_new_commit {} {


set commit_type normal set commit_type normal
$ui_comm delete 0.0 end $ui_comm delete 0.0 end
$ui_comm edit modified false
$ui_comm edit reset $ui_comm edit reset
$ui_comm edit modified false
rescan {set ui_status_value {Ready.}} rescan {set ui_status_value {Ready.}}
} }


@ -1025,8 +1025,8 @@ proc commit_committree {fd_wt curHEAD msg} {
} }


$ui_comm delete 0.0 end $ui_comm delete 0.0 end
$ui_comm edit modified false
$ui_comm edit reset $ui_comm edit reset
$ui_comm edit modified false


if {$single_commit} do_quit if {$single_commit} do_quit


@ -1966,7 +1966,7 @@ proc do_fsck_objects {} {
set is_quitting 0 set is_quitting 0


proc do_quit {} { proc do_quit {} {
global gitdir ui_comm is_quitting repo_config global gitdir ui_comm is_quitting repo_config commit_type


if {$is_quitting} return if {$is_quitting} return
set is_quitting 1 set is_quitting 1
@ -1975,14 +1975,16 @@ proc do_quit {} {
# #
set save [file join $gitdir GITGUI_MSG] set save [file join $gitdir GITGUI_MSG]
set msg [string trim [$ui_comm get 0.0 end]] set msg [string trim [$ui_comm get 0.0 end]]
if {[$ui_comm edit modified] && $msg ne {}} { if {![string match amend* $commit_type]
&& [$ui_comm edit modified]
&& $msg ne {}} {
catch { catch {
set fd [open $save w] set fd [open $save w]
puts $fd [string trim [$ui_comm get 0.0 end]] puts $fd [string trim [$ui_comm get 0.0 end]]
close $fd close $fd
} }
} elseif {$msg eq {} && [file exists $save]} { } else {
file delete $save catch {file delete $save}
} }


# -- Stash our current window geometry into this repository. # -- Stash our current window geometry into this repository.