diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-08-26 17:29:26 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-08-26 17:29:26 -0700 |
| commit | e92ea62425fb89713bc47241af29a79f5f191cc6 (patch) | |
| tree | a027f4d97331623b3a4d99eeea5e14557af990e3 /git-gui/lib | |
| parent | 09b0d9dde03df1432df06dcfcc20d8abecccb860 (diff) | |
| parent | c80d25dbce759a8483ffc1f085fdf4cd63cf9f05 (diff) | |
| download | git-e92ea62425fb89713bc47241af29a79f5f191cc6.tar.gz git-e92ea62425fb89713bc47241af29a79f5f191cc6.tar.xz | |
Merge branch 'master' of git://repo.or.cz/git-gui
* 'master' of git://repo.or.cz/git-gui:
git-gui: Correct 'git gui blame' in a subdirectory
git-gui: Do not offer to stage three-way diff hunks into the index
git-gui: Refactor diff pane popup support for future improvements
git-gui: Fix "unoptimized loading" to not cause git-gui to crash
git-gui: Paper bag fix "Stage Hunk For Commit" in diff context menu
git-gui: Allow git-merge to use branch names in conflict markers
git-gui: Fix window manager problems on ion3
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 24e8cecea..dc2141192 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 5de0d82b1..0e50919d4 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..." |