diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-12-09 15:38:51 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-12-09 15:38:51 -0800 |
| commit | 529f8c6ea6c13d85178d4ed10ed60ed8fd6f6c19 (patch) | |
| tree | 4d4f9f8a8de0c0a3bc618873fc91d399dd1a712d /git-gui/lib/remote_branch_delete.tcl | |
| parent | 47344eee9b980a7cf2a08d040ff3dd38c6cd82ec (diff) | |
| parent | 60204ddb99187dd329000864a618e57742372d74 (diff) | |
| download | git-529f8c6ea6c13d85178d4ed10ed60ed8fd6f6c19.tar.gz | |
Merge git://repo.or.cz/git-gui
* git://repo.or.cz/git-gui:
git-gui: suppress RenderBadPicture X error caused by Tk bug
git-gui: Increase blame viewer usability on MacOS.
git-gui: search 4 directories to improve statistic of gc hint
git gui: make current branch default in "remote delete branch" merge check
Diffstat (limited to 'git-gui/lib/remote_branch_delete.tcl')
| -rw-r--r-- | git-gui/lib/remote_branch_delete.tcl | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/git-gui/lib/remote_branch_delete.tcl b/git-gui/lib/remote_branch_delete.tcl index 31e0947488..241642062e 100644 --- a/git-gui/lib/remote_branch_delete.tcl +++ b/git-gui/lib/remote_branch_delete.tcl @@ -250,6 +250,8 @@ method _write_url {args} { set urltype url } method _write_check_head {args} { set checktype head } method _write_head_list {args} { + global current_branch + $head_m delete 0 end foreach abr $head_list { $head_m insert end radiobutton \ @@ -258,7 +260,11 @@ method _write_head_list {args} { -variable @check_head } if {[lsearch -exact -sorted $head_list $check_head] < 0} { - set check_head {} + if {[lsearch -exact -sorted $head_list $current_branch] < 0} { + set check_head {} + } else { + set check_head $current_branch + } } } |