Merge branch 'maint'

* maint:
git-gui: don't hide the Browse button when resizing the repo chooser

diff --git a/lib/choose_repository.tcl b/lib/choose_repository.tcl
index f9ff62a3b22fcc481c88dc35268d06d2fc4a5795..09277e9fa13858d50e6f93b6c8262999fb5cedb1 100644 (file)
--- a/lib/choose_repository.tcl
+++ b/lib/choose_repository.tcl
@@ -398,6 +398,8 @@ method _do_new {} {
        grid $w_body.where.l $w_body.where.t $w_body.where.b -sticky ew
        pack $w_body.where -fill x
 
+       grid columnconfigure $w_body.where 1 -weight 1
+
        trace add variable @local_path write [cb _write_local_path]
        bind $w_body.h <Destroy> [list trace remove variable @local_path write [cb _write_local_path]]
        update
@@ -998,6 +1000,8 @@ method _do_open {} {
        grid $w_body.where.l $w_body.where.t $w_body.where.b -sticky ew
        pack $w_body.where -fill x
 
+       grid columnconfigure $w_body.where 1 -weight 1
+
        trace add variable @local_path write [cb _write_local_path]
        bind $w_body.h <Destroy> [list trace remove variable @local_path write [cb _write_local_path]]
        update