mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-gui: Unlock the index when cancelling merge dialog

Browse Source 
Pressing the escape key while in the merge dialog cancels the merge
and correctly unlocks the index.  Unfortunately this is not true of
the Cancel button, using it closes the dialog but does not release
the index lock, rendering git-gui frozen until you restart it.  We
now properly release the index lock when the Cancel button is used.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
This commit is contained in:
Shawn O. Pearce
2007-07-04 02:29:32 -04:00
parent 7aecb12877
commit c8e23aaf18
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/merge.tcl
View File

@ -213,7 +213,9 @@ proc dialog {} {
pack $w.buttons.visualize -side left pack $w.buttons.visualize -side left
button $w.buttons.create -text Merge -command $_start button $w.buttons.create -text Merge -command $_start
pack $w.buttons.create -side right pack $w.buttons.create -side right
button $w.buttons.cancel -text {Cancel} -command [list destroy $w] button $w.buttons.cancel \
-text {Cancel} \
-command "unlock_index;destroy $w"
pack $w.buttons.cancel -side right -padx 5 pack $w.buttons.cancel -side right -padx 5
pack $w.buttons -side bottom -fill x -pady 10 -padx 10 pack $w.buttons -side bottom -fill x -pady 10 -padx 10