From 28cb707472ad2861f9d994c279a9b6077160522e Mon Sep 17 00:00:00 2001 From: Pat Thoyts Date: Sun, 1 Apr 2012 23:00:51 +0100 Subject: [PATCH 1/3] gitk: fix tabbed preferences construction when using tcl 8.4 In 8.5 the incr command creates the target variable if it does not exist but in 8.4 using incr on a non-existing variable raises an error. Ensure we have created our counter variable when creating the tabbed dialog for non-themed preferences. Reported-by: Ramsay Jones Signed-off-by: Pat Thoyts Signed-off-by: Junio C Hamano --- gitk | 1 + 1 file changed, 1 insertion(+) diff --git a/gitk b/gitk index 651b740043..68cd1a1fc5 100755 --- a/gitk +++ b/gitk @@ -11012,6 +11012,7 @@ proc doprefs {} { lappend pages [prefspage_general $notebook] [mc "General"] lappend pages [prefspage_colors $notebook] [mc "Colors"] lappend pages [prefspage_fonts $notebook] [mc "Fonts"] + set col 0 foreach {page title} $pages { if {$use_notebook} { $notebook add $page -text $title From 39ddf99c1db8b230ec7bdefc6ce3c769d1cf4ab6 Mon Sep 17 00:00:00 2001 From: Pat Thoyts Date: Sun, 1 Apr 2012 23:00:52 +0100 Subject: [PATCH 2/3] gitk: fix setting font display with new tabbed dialog layout. The changes to the dialog window tree broke the preview of the selected font on the button. This corrects that issue. Signed-off-by: Pat Thoyts Signed-off-by: Junio C Hamano --- gitk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitk b/gitk index 68cd1a1fc5..22270ce46b 100755 --- a/gitk +++ b/gitk @@ -10795,7 +10795,7 @@ proc fontok {} { if {$fontparam(slant) eq "italic"} { lappend fontpref($f) "italic" } - set w $prefstop.$f + set w $prefstop.notebook.fonts.$f $w conf -text $fontparam(family) -font $fontpref($f) fontcan From e5056c05ecd2bdaceaa95e12e9e94b1584ec59c8 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 3 Apr 2012 09:25:49 -0700 Subject: [PATCH 3/3] Git 1.7.10-rc4 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/1.7.10.txt | 14 +++++++------- GIT-VERSION-GEN | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Documentation/RelNotes/1.7.10.txt b/Documentation/RelNotes/1.7.10.txt index d326ff8495..fed9c73f08 100644 --- a/Documentation/RelNotes/1.7.10.txt +++ b/Documentation/RelNotes/1.7.10.txt @@ -32,12 +32,12 @@ Compatibility Notes * When you do not tell which branches and tags to push to the "git push" command in any way, the command used "matching refs" rule to update remote branches and tags with branches and tags with the same name you - locally have. In future versions of Git, this will change to use the - "upstream" rule to update the branch at the remote you would "pull" - from into your current branch with your local current branch. The - release after 1.7.10 will start issuing a warning about this change, - to encourage you to tell the command what to push out, e.g. by setting - push.default configuration. + locally have. In future versions of Git, this will change to push out + only your current branch according to either the "upstream" or the + "current" rule. Although "upstream" may be more powerful once the + user understands Git better, the semantics "current" gives is + simpler and easier to understand for beginners and may be a safer + and better default option, but we haven't decided yet. Updates since v1.7.9 @@ -58,7 +58,7 @@ UI, Workflows & Features * Teams for localizing the messages from the Porcelain layer of commands are starting to form, thanks to Jiang Xin who volunteered to be the localization coordinator. Translated messages for - simplified Chinese and Swedish are available. + simplified Chinese, Swedish and Portuguese are available. * The configuration mechanism learned an "include" facility; an assignment to the include.path pseudo-variable causes the named diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 52d52eb74f..57658cd953 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.7.10-rc3 +DEF_VER=v1.7.10-rc4 LF=' '