Merge branch 'master' of git://repo.or.cz/git-gui

[git.git] / git-gui / lib / remote_branch_delete.tcl

diff --git a/git-gui/lib/remote_branch_delete.tcl b/git-gui/lib/remote_branch_delete.tcl
index bc39581b86fdb9a9dc1d091c0d07b35a00c57ed9..c88a360db5daa136e2cea63323f85882ca26068a 100644 (file)
--- a/git-gui/lib/remote_branch_delete.tcl
+++ b/git-gui/lib/remote_branch_delete.tcl
@@ -98,10 +98,10 @@ constructor dialog {} {
        button $w.heads.footer.rescan \
                -text {Rescan} \
                -command [cb _rescan]
-       pack $w.heads.footer.status -side left -fill x -expand 1
+       pack $w.heads.footer.status -side left -fill x
        pack $w.heads.footer.rescan -side right
 
-       pack $w.heads.footer -side bottom -fill x -expand 1
+       pack $w.heads.footer -side bottom -fill x
        pack $w.heads.sby -side right -fill y
        pack $w.heads.l -side left -fill both -expand 1
        pack $w.heads -fill both -expand 1 -pady 5 -padx 5
@@ -131,7 +131,6 @@ constructor dialog {} {
        bind $w <$M1B-Key-R> [cb _rescan]
        bind $w <Key-Return> [cb _delete]
        bind $w <Key-Escape> [list destroy $w]
-       bind $w.header <Destroy> [list delete_this $this]
        return $w
 }
 
@@ -297,7 +296,7 @@ method _load {cache uri} {
                set full_list [list]
                set head_cache($cache) [list]
                set full_cache($cache) [list]
-               set active_ls [open "| [list git ls-remote $uri]" r]
+               set active_ls [git_read ls-remote $uri]
                fconfigure $active_ls \
                        -blocking 0 \
                        -translation lf \