diff options
Diffstat (limited to 'git-gui/lib')
| -rw-r--r-- | git-gui/lib/class.tcl | 3 | ||||
| -rw-r--r-- | git-gui/lib/merge.tcl | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/git-gui/lib/class.tcl b/git-gui/lib/class.tcl index 24e8cecea4..dc2141192a 100644 --- a/git-gui/lib/class.tcl +++ b/git-gui/lib/class.tcl @@ -148,11 +148,12 @@ proc make_toplevel {t w args} { } } - if {[winfo ismapped .]} { + if {$::root_exists || [winfo ismapped .]} { regsub -all {::} $this {__} w set top .$w set pfx $top toplevel $top + set ::root_exists 1 } else { set top . set pfx {} diff --git a/git-gui/lib/merge.tcl b/git-gui/lib/merge.tcl index 5de0d82b14..0e50919d4c 100644 --- a/git-gui/lib/merge.tcl +++ b/git-gui/lib/merge.tcl @@ -114,7 +114,7 @@ method _start {} { lappend cmd --strategy=recursive lappend cmd [git fmt-merge-msg <[gitdir FETCH_HEAD]] lappend cmd HEAD - lappend cmd $cmit + lappend cmd $name set msg "Merging $current_branch and $stitle" ui_status "$msg..." |