diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-06-11 00:52:37 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-06-11 00:52:37 -0700 |
| commit | 27c1dbea3e3a23b3c4b3707dfc9a71c3279ae279 (patch) | |
| tree | c0d0d6e3e10b5e1a2b9be8eb2de1a4b49448e97b /git-gui/lib/branch.tcl | |
| parent | cd030c3a7053aec0f9dbf321ef139ce02a821f3b (diff) | |
| parent | c288a2f1316b642ff073d4213cf691297610503c (diff) | |
| download | git-27c1dbea3e3a23b3c4b3707dfc9a71c3279ae279.tar.gz | |
Merge branch 'maint'
* maint: (46 commits)
git-gui: Changed blame header bar background to match main window
git-gui: Favor the original annotations over the recent ones
git-gui: Improve our labeling of blame annotation types
git-gui: Use three colors for the blame viewer background
git-gui: Jump to original line in blame viewer
git-gui: Display both commits in our tooltips
git-gui: Run blame twice on the same file and display both outputs
git-gui: Display the "Loading annotation..." message in italic
git-gui: Rename fields in blame viewer to better descriptions
git-gui: Label the uncommitted blame history entry
git-gui: Switch internal blame structure to Tcl lists
git-gui: Cleanup redundant column management in blame viewer
git-gui: Better document our blame variables
git-gui: Remove unused commit_list from blame viewer
git-gui: Automatically expand the line number column as needed
git-gui: Make the line number column slightly wider in blame
git-gui: Use lighter colors in blame view
git-gui: Remove unnecessary space between columns in blame viewer
git-gui: Remove the loaded column from the blame viewer
git-gui: Clip the commit summaries in the blame history menu
...
Diffstat (limited to 'git-gui/lib/branch.tcl')
| -rw-r--r-- | git-gui/lib/branch.tcl | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/git-gui/lib/branch.tcl b/git-gui/lib/branch.tcl index caaee5cf17..4f648b2bc7 100644 --- a/git-gui/lib/branch.tcl +++ b/git-gui/lib/branch.tcl @@ -201,12 +201,14 @@ proc do_create_branch {} { pack $w.desc -anchor nw -fill x -pady 5 -padx 5 labelframe $w.from -text {Starting Revision} - radiobutton $w.from.head_r \ - -text {Local Branch:} \ - -value head \ - -variable create_branch_revtype - eval tk_optionMenu $w.from.head_m create_branch_head $all_heads - grid $w.from.head_r $w.from.head_m -sticky w + if {$all_heads ne {}} { + radiobutton $w.from.head_r \ + -text {Local Branch:} \ + -value head \ + -variable create_branch_revtype + eval tk_optionMenu $w.from.head_m create_branch_head $all_heads + grid $w.from.head_r $w.from.head_m -sticky w + } set all_trackings [all_tracking_branches] if {$all_trackings ne {}} { set create_branch_trackinghead [lindex $all_trackings 0] |