diff options
| author | Heiko Voigt <hvoigt@hvoigt.net> | 2009-12-04 22:26:48 +0100 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2009-12-05 13:17:51 -0800 |
| commit | c0d153295c6f9140e644aa740f588257aac1f825 (patch) | |
| tree | 1d72f1a9492bdf068e52599c523f1a1f5161878a | |
| parent | acb9108c19e40b0477b8c828d1c5054665abbaf4 (diff) | |
| download | git-c0d153295c6f9140e644aa740f588257aac1f825.tar.gz git-c0d153295c6f9140e644aa740f588257aac1f825.tar.xz | |
git gui: make current branch default in "remote delete branch" merge check
We already do the same when locally deleting a branch.
Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
| -rw-r--r-- | lib/remote_branch_delete.tcl | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/remote_branch_delete.tcl b/lib/remote_branch_delete.tcl index 31e094748..241642062 100644 --- a/lib/remote_branch_delete.tcl +++ b/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 + } } } |