diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-06-16 20:06:55 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-16 20:06:55 -0700 |
| commit | fb7dfaa710da6f9ebb854f70ffc1c78668a1e70c (patch) | |
| tree | e09f2a46099de99a00e1a256b5dfad02927c7ad9 /git-gui/lib/remote.tcl | |
| parent | 0dbd81251dbc516bb3bf07862c369fc582a4e5e0 (diff) | |
| parent | 8a383db4b28059becc3ebfd1b402299e34c3151f (diff) | |
| download | git-fb7dfaa710da6f9ebb854f70ffc1c78668a1e70c.tar.gz git-fb7dfaa710da6f9ebb854f70ffc1c78668a1e70c.tar.xz | |
Merge tag 'gitgui-0.18.0' of git://repo.or.cz/git-gui
git-gui 0.18.0
* tag 'gitgui-0.18.0' of git://repo.or.cz/git-gui:
git-gui 0.18
git-gui: avoid an error message when removing the last remote
git-gui: fix file name handling with non-empty prefix
git-gui: bring wish process to front on Mac
git-gui: change dialog button positions for Windows to suit platform.
git-gui: allow "\ No newline at end of file" for linewise staging
git-gui: fix the mergetool launcher for the Beyond Compare tool.
Makefile: replace "echo 1>..." with "echo >..."
French translation: copy -> copie.
git-gui: Fix parsing of <rev> <path-which-not-present-in-worktree>
Diffstat (limited to 'git-gui/lib/remote.tcl')
| -rw-r--r-- | git-gui/lib/remote.tcl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/git-gui/lib/remote.tcl b/git-gui/lib/remote.tcl index 5e4e7f4c8..4e5c78441 100644 --- a/git-gui/lib/remote.tcl +++ b/git-gui/lib/remote.tcl @@ -245,7 +245,8 @@ proc update_all_remotes_menu_entry {} { set prune_m $remote_m.prune if {$have_remote > 1} { make_sure_remote_submenues_exist $remote_m - if {[$fetch_m entrycget end -label] ne "All"} { + if {[$fetch_m type end] eq "command" \ + && [$fetch_m entrycget end -label] ne "All"} { $fetch_m insert end separator $fetch_m insert end command \ @@ -259,7 +260,8 @@ proc update_all_remotes_menu_entry {} { } } else { if {[winfo exists $fetch_m]} { - if {[$fetch_m entrycget end -label] eq "All"} { + if {[$fetch_m type end] eq "command" \ + && [$fetch_m entrycget end -label] eq "All"} { delete_from_menu $fetch_m end delete_from_menu $fetch_m end |