diff options
| author |  Shawn O. Pearce <spearce@spearce.org> | 2007-07-04 02:29:32 -0400 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-07-04 02:29:32 -0400 |
| commit | c8e23aaf1814b95d64fc536fdf1acaa54bb28411 (patch) | |
| tree | 1141d1bd34735f012402765b52d52b0e59aa7e5e /lib/merge.tcl | |
| parent | git-gui: properly popup error if gitk should be started but is not installed (diff) | |
| download | tgif-c8e23aaf1814b95d64fc536fdf1acaa54bb28411.tar.xz | |
git-gui: Unlock the index when cancelling merge dialog
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>
Diffstat (limited to 'lib/merge.tcl')
| -rw-r--r-- | lib/merge.tcl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/merge.tcl b/lib/merge.tcl index ae0389df5b..889182f545 100644 --- a/lib/merge.tcl +++ b/lib/merge.tcl @@ -213,7 +213,9 @@ proc dialog {} { pack $w.buttons.visualize -side left button $w.buttons.create -text Merge -command $_start 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 -side bottom -fill x -pady 10 -padx 10 |